X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Froundcube%2Flocal.sh;h=67a26754a24c11cfd162527375dd541407bc7fd8;hp=6920cefee9aa092b20810a4fb0d470a2a190f152;hb=9075978ae94310fa7a27d9881d3cecc6150ca3e9;hpb=8861456f050ddaa2797cd93e9d2b7808b282d289

diff --git a/etc/nginx/site.d/roundcube/local.sh b/etc/nginx/site.d/roundcube/local.sh
index 6920cef..67a2675 100644
--- a/etc/nginx/site.d/roundcube/local.sh
+++ b/etc/nginx/site.d/roundcube/local.sh
@@ -7,9 +7,9 @@ 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
@@ -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:
@@ -152,14 +152,14 @@ sudo etckeeper commit -m "runit-configure nginx -- $site"
  roundcube \
  roundcube-pgsql \
  roundcube-plugins
-sudo chgrp php5_$site /var/log/roundcube/
+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