diff --git a/README.md b/README.md index 9844614..fda331e 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ opensondage_ynh =============== OpenSondage for YunoHost + +OpenSondage is used to poll people invite for a meeting. diff --git a/conf/nginx.conf b/conf/nginx.conf index efb6b54..1873df9 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,7 +7,7 @@ location PATHTOCHANGE { try_files $uri $uri/ /index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_pass unix:/var/run/php5-fpm-opensondage.sock; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; diff --git a/conf/nginx.conf-public b/conf/nginx.conf-public index a18b3ab..3897aee 100644 --- a/conf/nginx.conf-public +++ b/conf/nginx.conf-public @@ -7,7 +7,7 @@ location PATHTOCHANGE { try_files $uri $uri/ /index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_pass unix:/var/run/php5-fpm-opensondage.sock; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; diff --git a/conf/variables.php.template b/conf/variables.php.template index 2dceb11..8bc2647 100644 --- a/conf/variables.php.template +++ b/conf/variables.php.template @@ -41,7 +41,7 @@ const STUDS_URL = 'yunourl'; // Nom de l'application -const NOMAPPLICATION = "yunotitle"; +const NOMAPPLICATION = "OpenSondage"; // adresse mail de l'administrateur de la base const ADRESSEMAILADMIN = 'yunoadmin'; diff --git a/scripts/install b/scripts/install index 1d91f72..2ce0a3d 100755 --- a/scripts/install +++ b/scripts/install @@ -68,13 +68,29 @@ sudo yunohost app ssowatconf # Db installation mysql -u $db_user -p$db_pwd $db_user < $final_path/install.mysql.sql + +sed -i "s@NAMETOCHANGE@opensondage@g" ../conf/php-fpm.conf +finalphpconf=/etc/php5/fpm/pool.d/opensondage.conf +sudo cp ../conf/php-fpm.conf $finalphpconf +sudo chown root: $finalphpconf +sudo chmod 644 $finalphpconf + +finalphpini=/etc/php5/fpm/conf.d/20-opensondage.ini +sudo cp ../conf/php-fpm.ini $finalphpini +sudo chown root: $finalphpini +sudo chmod 644 $finalphpini + +# Reload Nginx and regenerate SSOwat conf +sudo service php5-fpm restart + + if [ $is_public = "No" ]; then sudo yunohost app setting opensondage skipped_uris -d - sudo yunohost app ssowatconf else mysql -u $db_user -p$db_pwd $db_user < ../conf/public.sql sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/opensondage.conf sudo service nginx reload echo "define('FORCE_SSL_ADMIN', true);" | sudo tee -a $final_path/variables.php fi +sudo yunohost app ssowatconf diff --git a/scripts/upgrade b/scripts/upgrade index a3d222d..8e4f934 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -77,5 +77,17 @@ else sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/opensondage.conf fi +sed -i "s@NAMETOCHANGE@opensondage@g" ../conf/php-fpm.conf +finalphpconf=/etc/php5/fpm/pool.d/opensondage.conf +sudo cp ../conf/php-fpm.conf $finalphpconf +sudo chown root: $finalphpconf +sudo chmod 644 $finalphpconf + +finalphpini=/etc/php5/fpm/conf.d/20-opensondage.ini +sudo cp ../conf/php-fpm.ini $finalphpini +sudo chown root: $finalphpini +sudo chmod 644 $finalphpini + +sudo service php5-fpm restart # Reload Nginx sudo service nginx reload