From: Ludovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Date: Tue, 8 Oct 2013 21:59:15 +0000 (+0200)
Subject: Modifications : etc/dovecot/dovecot.conf.m4
X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=commitdiff_plain;h=3dde6e2b7fcd76a6116a32c92fd8faa87c0c54e7;hp=e982928c9f8bd170f1b2dd48fbd2dc50c487c5b2

Modifications : etc/dovecot/dovecot.conf.m4
---

diff --git a/etc/nginx/site.d/roundcube/http.conf b/etc/nginx/site.d/roundcube/http.conf
index dd5d1ce..4d79aa1 100644
--- a/etc/nginx/site.d/roundcube/http.conf
+++ b/etc/nginx/site.d/roundcube/http.conf
@@ -2,7 +2,8 @@ server {
 	listen 80;
 	server_name
 	 roundcube.heureux-cyclage.org
-	 roundcube.cyclocoop.org;
+	 roundcube.cyclocoop.org
+	 roundcube.ptitvelo.net;
 	
 	return 301 https://$host$request_uri;
  }
diff --git a/etc/nginx/site.d/roundcube/site.conf b/etc/nginx/site.d/roundcube/site.conf
index 6511577..64f8388 100644
--- a/etc/nginx/site.d/roundcube/site.conf
+++ b/etc/nginx/site.d/roundcube/site.conf
@@ -1,6 +1,7 @@
 server_name
  roundcube.heureux-cyclage.org
- roundcube.cyclocoop.org;
+ roundcube.cyclocoop.org
+ roundcube.ptitvelo.net;
 
 client_body_buffer_size 8k;
 client_max_body_size 10m;
diff --git a/etc/sv/git-daemon/local.sh b/etc/sv/git-daemon/local.sh
index cd4b6eb..326b110 100644
--- a/etc/sv/git-daemon/local.sh
+++ b/etc/sv/git-daemon/local.sh
@@ -13,9 +13,9 @@ sudo install -d -m 770 -o git -g "$sv" \
 sudo adduser "$sv" git-data
 
 sudo ln -fns \
- ../pub \
+ ../data \
  "$home"/git.$local_domainname
 sudo ln -fns \
- ../pub \
+ ../data \
  "$home"/burette.$local_domainname
  # NOTE : rétro-compatibilité
diff --git a/etc/sv/postfix/local.sh b/etc/sv/postfix/local.sh
index 85e0436..1023ab9 100644
--- a/etc/sv/postfix/local.sh
+++ b/etc/sv/postfix/local.sh
@@ -81,13 +81,13 @@ sudo install -m 640 -o root -g root \
  "$tool"/etc/postfix/$local_domainname/transport \
         /etc/postfix/$local_domainname/transport
 sudo postmap hash:/etc/postfix/$local_domainname/transport
-sudo postmap hash:/etc/postfix/$local_domainname/transport-pending-transition-from-lautrenet
-	# TODO: supprimer ce transport à la migration des MX de lautre.net à ici.
+sudo postmap hash:/etc/postfix/ptitvelo.net/transport-pending-transition-from-lautrenet
+       # TODO: supprimer ce transport à la migration des MX de lautre.net à ici.
 sudo postmap hash:/etc/postfix/$local_domainname/virtual_alias
-sudo postmap hash:/etc/postfix/$local_domainname/virtual_alias-pending-transition-from-lautrenet
-	# TODO: supprimer ce virtual_alias à la migration des MX de lautre.net à ici.
 sudo postmap hash:/etc/postfix/cyclocoop.org/virtual_alias
 sudo postmap hash:/etc/postfix/ptitvelo.net/virtual_alias
+sudo postmap hash:/etc/postfix/ptitvelo.net/virtual_alias-pending-transition-from-lautrenet
+       # TODO: supprimer ce virtual_alias à la migration des MX de lautre.net à ici.
 sudo install -d -m 770 -o root -g root \
  /etc/skel/etc/mail \
  /etc/skel/var/cache/mail \
diff --git a/local/gitolite-configure b/local/gitolite-configure
index bd25ec3..21060bd 100755
--- a/local/gitolite-configure
+++ b/local/gitolite-configure
@@ -26,10 +26,10 @@ sudo chfn --full-name git git
  --disabled-login \
  --disabled-password \
  --group \
- --home /home/git/pub \
+ --home /home/git/data \
  --shell /bin/false \
  --system
-sudo adduser git        git-data
+sudo adduser git git-data
 sudo install -d -m 750 -o git -g git \
  /etc/gitolite \
  /home/git/etc \
@@ -37,7 +37,7 @@ sudo install -d -m 750 -o git -g git \
 sudo install -d -m 751 -o git -g git \
  /home/git
 sudo install -d -m 2770 -o git-data -g git-data \
- /home/git/pub
+ /home/git/data
 sudo install -d -m 1771 -o git -g git \
  /home/git/log
 sudo install -d -m 2770 -o git -g log-git \
@@ -86,7 +86,7 @@ sudo install -m 770 -o git -g git /dev/stdin \
 	\$GL_WILDREPOS_PERM_CATS = "READERS WRITERS";
 	\$HTPASSWD_FILE = "";
 	\$PROJECTS_LIST = \$ENV{HOME} . "/etc/gitweb/projects.list";
-	\$REPO_BASE = "pub";
+	\$REPO_BASE = "data";
 	\$REPO_UMASK = 0007;
 	\$RSYNC_BASE = "";
 	\$SVNSERVE = "";