diff --git a/check_process b/check_process index 654ee04..5a0e4a7 100644 --- a/check_process +++ b/check_process @@ -16,9 +16,11 @@ #upgrade=1 from_commit=de467cfa38791f43215ffea88d4b85460e5c0457 # 2.3.10~ynh1 #upgrade=1 from_commit=086de718f49a506c66498d2f7610f5fd0ce07d50 + # 2.6.1~ynh1 + upgrade=1 from_commit=c40349020d98356d24b8f534722839fe35cf41fd backup_restore=1 # Activate multi-instance test only if you have more than 2Gb RAM! - #multi_instance=1 + multi_instance=0 change_url=1 ;;; Options Email= @@ -29,5 +31,5 @@ Notification=none manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1& ; commit=086de718f49a506c66498d2f7610f5fd0ce07d50 name=2.3.10~ynh1 - ; commit=b2e6633e0145c7eed2eb8c645ca7dbbd6c26fc06 - name=2.6.0~ynh1 + ; commit=c40349020d98356d24b8f534722839fe35cf41fd + name=Merge pull request #70 diff --git a/scripts/install b/scripts/install index 2ab6455..f4c4ecb 100644 --- a/scripts/install +++ b/scripts/install @@ -286,9 +286,9 @@ mkdir -p "public/forum" cd public/forum && ln -s ../uploads && ln -s ../backups ) -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +# chmod 750 "$final_path" +# chmod -R o-rwx "$final_path" +# chown -R $app:www-data "$final_path" #================================================= # SETUP LOGROTATE diff --git a/scripts/upgrade b/scripts/upgrade index f50537b..f6c6732 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -203,7 +203,7 @@ then ynh_add_config --template="../conf/discourse_defaults.conf" --destination="$final_path/config/discourse.conf" chmod 400 "$final_path/config/discourse.conf" - chown $app:$app "$final_path/config/discourse.conf" + chown $app "$final_path/config/discourse.conf" # Configure LDAP plugin ynh_add_config --template="../conf/settings.yml" --destination="$final_path/plugins/discourse-ldap-auth/config/settings.yml" @@ -231,10 +231,10 @@ then secret="$(ynh_string_random)" ynh_add_config --template="../conf/secrets.yml" --destination="$final_path/config/secrets.yml" - # Set permissions to app files - chmod 750 "$final_path" - chmod -R o-rwx "$final_path" - chown -R $app:www-data "$final_path" + # # Set permissions to app files + # chmod 750 "$final_path" + # chmod -R o-rwx "$final_path" + # chown -R $app:www-data "$final_path" pushd "$final_path" # Install bundler, a gems installer @@ -336,10 +336,10 @@ mkdir -p "$final_path/tmp/sockets" fi ) -# Set permissions to app files -chmod 750 "$final_path" -chmod -R o-rwx "$final_path" -chown -R $app:www-data "$final_path" +# # Set permissions to app files +# chmod 750 "$final_path" +# chmod -R o-rwx "$final_path" +# chown -R $app:www-data "$final_path" #================================================= # SETUP LOGROTATE