From 0247c4c3ed2ecae7ed00ec76c5724416006a15ef Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Fri, 14 Jul 2017 17:22:55 +0200 Subject: [PATCH] Remove sudo prefix for change_url_app_ynh to test that change_url scripts are actually run as root. --- change_url_app_ynh/scripts/change_url | 6 +++--- change_url_app_ynh/scripts/install | 16 ++++++++-------- change_url_app_ynh/scripts/remove | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/change_url_app_ynh/scripts/change_url b/change_url_app_ynh/scripts/change_url index f1617d8..53e23e9 100644 --- a/change_url_app_ynh/scripts/change_url +++ b/change_url_app_ynh/scripts/change_url @@ -12,11 +12,11 @@ new_path=$YNH_APP_NEW_PATH nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf if [[ "$new_path" == "" ]]; then - sudo sed -i "s@location .\+ {@location / {@g" $nginx_conf_path + sed -i "s@location .\+ {@location / {@g" $nginx_conf_path else - sudo sed -i "s@location .\+ {@location $new_path {@g" $nginx_conf_path + sed -i "s@location .\+ {@location $new_path {@g" $nginx_conf_path fi if [ $old_domain != $new_domain ]; then - sudo mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf fi diff --git a/change_url_app_ynh/scripts/install b/change_url_app_ynh/scripts/install index 396b80e..66cd900 100644 --- a/change_url_app_ynh/scripts/install +++ b/change_url_app_ynh/scripts/install @@ -8,7 +8,7 @@ domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH # Check domain/path availability -sudo yunohost app checkurl $domain$path -a $app +yunohost app checkurl $domain$path -a $app if [[ ! $? -eq 0 ]]; then exit 1 fi @@ -19,16 +19,16 @@ else sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf fi -sudo sed -i "s@FOLDER@$app/@g" ../conf/nginx.conf +sed -i "s@FOLDER@$app/@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf +cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf -sudo mkdir -p /var/www/$app +mkdir -p /var/www/$app -sudo cp ../conf/index.html /var/www/$app +cp ../conf/index.html /var/www/$app # Reload Nginx and regenerate SSOwat conf -sudo service nginx reload +service nginx reload -sudo yunohost app setting $app unprotected_uris -v "/" -sudo yunohost app ssowatconf +yunohost app setting $app unprotected_uris -v "/" +yunohost app ssowatconf diff --git a/change_url_app_ynh/scripts/remove b/change_url_app_ynh/scripts/remove index 19f4c76..4c6c0ba 100644 --- a/change_url_app_ynh/scripts/remove +++ b/change_url_app_ynh/scripts/remove @@ -3,9 +3,9 @@ set -eux # See comments in install script app=$YNH_APP_INSTANCE_NAME -domain=$(sudo yunohost app setting $app domain) +domain=$(yunohost app setting $app domain) -sudo rm -rf /var/www/$app -sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf +rm -rf /var/www/$app +rm -f /etc/nginx/conf.d/$domain.d/$app.conf -sudo service nginx reload +service nginx reload