X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fnginx%2Fsite.d%2Froundcube%2Flocal.sh;h=09240d1add92e5fd78e03ba0f70fb1f858675638;hb=68907c325d5bda4f199a7f2977b275e6fb1e7a02;hp=6920cefee9aa092b20810a4fb0d470a2a190f152;hpb=b75d4503ef9c919231c0c02daf5a1ed1e57c73af;p=lhc%2Fateliers.git

diff --git a/etc/nginx/site.d/roundcube/local.sh b/etc/nginx/site.d/roundcube/local.sh
index 6920cef..09240d1 100644
--- a/etc/nginx/site.d/roundcube/local.sh
+++ b/etc/nginx/site.d/roundcube/local.sh
@@ -1,15 +1,15 @@
 hint="run before: remote/runit-configure nginx -- $site"
 assert "sudo test -f /etc/nginx/x509.d/\"$site\"/key.pem" hint
 hint="run before: remote/runit-configure nginx -- $site"
-assert "sudo test -f /etc/$site/main.inc.php" hint
+assert "sudo test -f /etc/$site/config.inc.php" hint
 
 sudo install -m 664 -o www -g www \
  "$tool"/var/pub/x509/"$site"."$local_domainname"/crt+ca.pem \
  /etc/nginx/x509.d/"$site"/crt.pem
 
-sudo adduser php5_"$site" www-"$site"
-sudo adduser php5_"$site" postgres-data
-sudo adduser php5_"$site" log-php5-"$site"
+sudo adduser php_"$site" www-"$site"
+sudo adduser php_"$site" postgres-data
+sudo adduser php_"$site" log-php-"$site"
 
 "$tool"/local/runit-sv-configure postgres
 "$tool"/local/runit-sv-start     postgres
@@ -49,7 +49,7 @@ sudo debconf-set-selections <<-EOF || true
 	# Do you want to purge the database for roundcube?
 	roundcube-core	roundcube/purge	boolean	false
 	# Configure database for roundcube with dbconfig-common?
-	roundcube-core	roundcube/dbconfig-install	boolean	true
+	roundcube-core	roundcube/dbconfig-install	boolean	false
 	# Default language:
 	# Choices: ar_SA, ast, az_AZ, bg_BG, bn_BD, br, bs_BA, ca_ES, cs_CZ, cy_GB, da_DK, de_CH, de_DE, el_GR, en_GB, en_US, eo, es_AR, es_ES, et_EE, eu_ES, fa, fa_AF, fi_FI, fr_FR, ga_IE, gl_ES, he_IL, hi_IN, hr_HR, hu_HU, hy_AM, id_ID, is_IS, it_IT, ja_JP, ka_GE, kh_KH, ko_KR, ku, lt_LT, lv_LV, mk_MK, mr_IN, ms_MY, nb_NO, ne_NP, nl_BE, nl_NL, nn_NO, pl_PL, ps, pt_BR, pt_PT, ro_RO, ru_RU, si_LK, sk_SK, sl_SI, sq_AL, sr_CS, sv_SE, ta_IN, th_TH, tr_TR, uk_UA, vi_VN, zh_CN, zh_TW
 	roundcube-core	roundcube/language	select	fr_FR
@@ -78,7 +78,7 @@ sudo debconf-set-selections <<-EOF || true
 	# for internal use.
 	roundcube-core	roundcube/internal/skip-preseed	boolean	false
 	# PostgreSQL username for roundcube:
-	roundcube-core	roundcube/db/app-user	string	php5_$site
+	roundcube-core	roundcube/db/app-user	string	php_$site
 	# Reinstall database for roundcube?
 	roundcube-core	roundcube/dbconfig-reinstall	boolean	false
 	# Connection method for MySQL database of roundcube:
@@ -142,24 +142,24 @@ sudo install -m 600 -o root -g root /dev/stdin \
 ! sudo etckeeper unclean ||
 sudo etckeeper commit -m "runit-configure nginx -- $site"
 
-"$tool"/local/apt-get-install \
- aspell-de \
- aspell-en \
- aspell-es \
- aspell-it \
- aspell-fr \
- aspell-pl \
- roundcube \
- roundcube-pgsql \
- roundcube-plugins
-sudo chgrp php5_$site /var/log/roundcube/
+#"$tool"/local/apt-get-install \
+# aspell-de \
+# aspell-en \
+# aspell-es \
+# aspell-it \
+# aspell-fr \
+# aspell-pl \
+# roundcube \
+# roundcube-pgsql \
+# roundcube-plugins
+sudo chgrp php_$site /var/log/roundcube/
 
-sudo install -d -m 750 -o root -g php5_"$site" \
+sudo install -d -m 750 -o root -g php_"$site" \
  /etc/"$site"
 sudo find "$tool"/etc/"$site" -type f \
- -exec install -m 640 -o root -g php5_"$site" \
+ -exec install -m 640 -o root -g php_"$site" \
  -t /etc/"$site"/ {} +
 
-sudo install -m 500 -o php5_"$site" -g root \
+sudo install -m 500 -o php_"$site" -g root \
   "$tool"/local/roundcube-chpasswd \
  /usr/local/bin/roundcube-chpasswd