Modification : raccourcissement des noms UNIX pour MySQL : php5_ -> php_ .

[lhc/ateliers.git] / etc / nginx / site.d / agendav / local.sh

diff --git a/etc/nginx/site.d/agendav/local.sh b/etc/nginx/site.d/agendav/local.sh
index 3ccb68c..2003da6 100644 (file)
--- a/etc/nginx/site.d/agendav/local.sh
+++ b/etc/nginx/site.d/agendav/local.sh
@@ -1,11 +1,11 @@
 sudo adduser www-"$site"-tls www-"$site"
 sudo adduser www-"$site"-tls www-"$site"

-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"

 
 hint="run before: remote/runit-configure nginx -- $site"
 assert "sudo test -f /etc/$site/config.php" hint
 
 hint="run before: remote/runit-configure nginx -- $site"
 assert "sudo test -f /etc/$site/config.php" hint

-sudo chgrp php5_$site /etc/"$site"/config.php
+sudo chgrp php_$site /etc/"$site"/config.php

 
 sudo sv start postgres
 while ! sudo -u postgres psql </dev/null
 
 sudo sv start postgres
 while ! sudo -u postgres psql </dev/null


@@ -26,12 +26,12 @@ if test ! shared = "$(sudo -u postgres psql -AqtX "$site" <<-EOF
  )"
  then
        sudo cat "$home"/sql/pgsql.schema.sql |
  )"
  then
        sudo cat "$home"/sql/pgsql.schema.sql |

-       sudo -u php5_"$site" psql -f - -U "$site" --set ON_ERROR_STOP=1 "$site"
+       sudo -u php_"$site" psql -f - -U "$site" --set ON_ERROR_STOP=1 "$site"

  fi
 
  fi
 

-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 \
  -not -name config.php \
  /etc/"$site"
 sudo find "$tool"/etc/"$site" -type f \
  -not -name config.php \

- -exec install -m 640 -o root -g php5_"$site" \
+ -exec install -m 640 -o root -g php_"$site" \

  -t /etc/"$site"/ {} +
  -t /etc/"$site"/ {} +