From ff1ca4078e97006269412c8b183e878e4b711410 Mon Sep 17 00:00:00 2001 From: monsieur-a Date: Mon, 7 Jul 2014 18:59:01 +0200 Subject: [PATCH] Revert "test php" This reverts commit 727e29d5cb3ed8af49d5a48af05cfb5c0e8bcedb. --- scripts/install | 10 +++++++++- scripts/remove | 2 -- scripts/remove~ | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index ee1c271..d0b7adf 100644 --- a/scripts/install +++ b/scripts/install @@ -39,7 +39,7 @@ final_path=/var/www/piwigo sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf sed -i "s@ALIASTOCHANGE@$final_path/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/piwigo.conf -sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/piwigo.conf + # Copy files to the right place @@ -103,7 +103,15 @@ then sudo yunohost app setting piwigo protected_uris -v "/" sudo yunohost app ssowatconf fi +#configurer php +sudo cp ../conf/php-fpm.conf /etc/php5/fpm/pool.d/piwigo.conf +sudo cp ../conf/php-fpm.ini /etc/php5/fpm/conf.d/20-piwigo.ini +sudo sed -i "s@NAMETOCHANGE@piwigo@g" /etc/php5/fpm/pool.d/piwigo.conf + +sudo service php5-fpm restart +sudo service nginx reload +sudo yunohost app ssowatconf # Remove temporary entry in /etc/hosts sudo sed -i '/yunopiwigo/d' /etc/hosts diff --git a/scripts/remove b/scripts/remove index 4e2c0c0..4329e0d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,8 +10,6 @@ mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localh sudo rm -rf /var/www/piwigo sudo rm -f /etc/nginx/conf.d/$domain.d/piwigo.conf sudo rm -rf /home/yunohost.app/piwigo -sudo rm /etc/php5/fpm/pool.d/piwigo.conf -sudo rm /etc/php5/fpm/conf.d/20-piwigo.ini sudo service nginx reload diff --git a/scripts/remove~ b/scripts/remove~ index ee1a40c..60973d0 100644 --- a/scripts/remove~ +++ b/scripts/remove~ @@ -9,9 +9,9 @@ mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localh sudo rm -rf /var/www/piwigo sudo rm -f /etc/nginx/conf.d/$domain.d/piwigo.conf +sudo rm -f /etc/php5/fpm/pool.d/piwigo.conf +sudo rm -f /etc/php5/fpm/conf.d/20-piwigo.ini sudo rm -rf /home/yunohost.app/piwigo -sudo rm /etc/php5/fpm/pool.d/piwigo.conf -sudo rm/etc/php5/fpm/conf.d/20-piwigo.ini sudo service nginx reload