diff --git a/scripts/install b/scripts/install index c3b2936..d759113 100755 --- a/scripts/install +++ b/scripts/install @@ -58,21 +58,7 @@ chmod 700 $final_path/admin/logs_studs.txt # Set permissions to roundcube directory sudo chown -R www-data: $final_path -# Modify Nginx configuration file and copy it to Nginx conf directory -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/opensondage.conf -# Reload Nginx and regenerate SSOwat conf -sudo service nginx reload -sudo yunohost app setting opensondage skipped_uris -v "/" -if [ $public_site = "No" ]; -then - sudo yunohost app setting opensondage protected_uris -v "/admin,/index.php,/choix_sondage.php,/info_sondage.php" -else - sudo yunohost app setting opensondage protected_uris -v "/admin" -fi -sudo yunohost app ssowatconf # Db installation mysql -u $db_user -p$db_pwd $db_user < $final_path/install.mysql.sql @@ -94,6 +80,18 @@ sudo service php5-fpm restart sudo apt-get install php-fpdf sudo yunohost app addaccess opensondage -u $admin -sudo cp ../conf/nginx.conf-public /etc/nginx/conf.d/$domain.d/opensondage.conf + +# Modify Nginx configuration file and copy it to Nginx conf directory +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/opensondage.conf +# Reload Nginx and regenerate SSOwat conf sudo service nginx reload +sudo yunohost app setting opensondage skipped_uris -v "/" +if [ $public_site = "No" ]; +then + sudo yunohost app setting opensondage protected_uris -v "/admin,/index.php,/choix_date.php,/infos_sondage.php" +else + sudo yunohost app setting opensondage protected_uris -v "/admin" +fi sudo yunohost app ssowatconf diff --git a/scripts/upgrade b/scripts/upgrade index 0c37747..ea9918b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -93,7 +93,7 @@ sudo service nginx reload sudo yunohost app setting opensondage skipped_uris -v "/" if [ $public_site = "No" ]; then - sudo yunohost app setting opensondage protected_uris -v "/admin,/index.php,/choix_sondage.php,/info_sondage.php" + sudo yunohost app setting opensondage protected_uris -v "/admin,/index.php,/choix_date.php,/infos_sondage.php" else sudo yunohost app setting opensondage protected_uris -v "/admin" fi