diff --git a/check_process b/check_process index bede8fa..2bfd018 100644 --- a/check_process +++ b/check_process @@ -12,11 +12,11 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash + upgrade=0 from_commit=CommitHash backup_restore=1 multi_instance=1 port_already_use=0 - change_url=1 + change_url=0 ;;; Options Email= Notification=none diff --git a/conf/nginx.conf b/conf/nginx.conf index ebb051e..119f226 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -27,7 +27,7 @@ location __PATH__/ { location ~ ^__PATH__/(assets|static|themes|uploads) { access_log off; expires 10d; - add_header Cache-Control "public, no-transform"; + more_set_headers "Cache-Control: public, no-transform"; } location ~ ^__PATH__/(protected|framework|themes/\w+/views|\.|uploads/file) { diff --git a/manifest.json b/manifest.json index 4102b9f..6d68468 100644 --- a/manifest.json +++ b/manifest.json @@ -9,9 +9,10 @@ "url": "https://www.humhub.org", "license": "free", "maintainer": { - "name": "Scith", - "url": "https://github.com/scith" + "name": "Nils Van Zuijlen", + "url": "https://github.com/nils-van-zuijlen" }, + "version": "1.7.2~ynh1", "requirements": { "yunohost": ">= 4.0.0" }, diff --git a/scripts/install b/scripts/install index eb8abe1..4521373 100644 --- a/scripts/install +++ b/scripts/install @@ -168,7 +168,7 @@ local_curl_csrf "/index.php?r=installer/config/sample-data" \ "SampleDataForm[sampleData]=0" # Populate the LDAP parameters -sed -i "s@__ADMIN__@$admin@g" ../conf/ldap.sql +ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="../conf/ldap.sql" mysql -u $db_user -p${db_pwd} $db_name < ../conf/ldap.sql # Remove the public access diff --git a/scripts/restore b/scripts/restore index d12fad9..f0f265c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -81,9 +81,6 @@ chown -R $app $final_path/protected/modules chown -R $app $final_path/protected/runtime chown -R $app $final_path/uploads/* -# This file contains the db password -chmod g-rwx o-rwx $final_path/protected/config/dynamic.php - #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 9ce5687..075f907 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,7 +120,7 @@ then cp -a "$final_path.old/themes/." "$final_path/themes/" # Delete old source - rm -rf "$final_path.old" + ynh_secure_remove --file="$final_path.old" fi #================================================= @@ -131,13 +131,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." - # Create a dedicated NGINX config ynh_add_nginx_config -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." --time --weight=1 - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # CREATE DEDICATED USER #=================================================