1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/humhub_ynh.git synced 2024-09-03 19:26:11 +02:00

Apply CI suggested changes

This commit is contained in:
Nils VAN ZUIJLEN 2021-03-12 18:07:18 +01:00
parent 90501d91e9
commit 429955d88a
6 changed files with 8 additions and 17 deletions

View file

@ -12,11 +12,11 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=CommitHash upgrade=0 from_commit=CommitHash
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
port_already_use=0 port_already_use=0
change_url=1 change_url=0
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none

View file

@ -27,7 +27,7 @@ location __PATH__/ {
location ~ ^__PATH__/(assets|static|themes|uploads) { location ~ ^__PATH__/(assets|static|themes|uploads) {
access_log off; access_log off;
expires 10d; 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) { location ~ ^__PATH__/(protected|framework|themes/\w+/views|\.|uploads/file) {

View file

@ -9,9 +9,10 @@
"url": "https://www.humhub.org", "url": "https://www.humhub.org",
"license": "free", "license": "free",
"maintainer": { "maintainer": {
"name": "Scith", "name": "Nils Van Zuijlen",
"url": "https://github.com/scith" "url": "https://github.com/nils-van-zuijlen"
}, },
"version": "1.7.2~ynh1",
"requirements": { "requirements": {
"yunohost": ">= 4.0.0" "yunohost": ">= 4.0.0"
}, },

View file

@ -168,7 +168,7 @@ local_curl_csrf "/index.php?r=installer/config/sample-data" \
"SampleDataForm[sampleData]=0" "SampleDataForm[sampleData]=0"
# Populate the LDAP parameters # 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 mysql -u $db_user -p${db_pwd} $db_name < ../conf/ldap.sql
# Remove the public access # Remove the public access

View file

@ -81,9 +81,6 @@ chown -R $app $final_path/protected/modules
chown -R $app $final_path/protected/runtime chown -R $app $final_path/protected/runtime
chown -R $app $final_path/uploads/* 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 # RESTORE THE PHP-FPM CONFIGURATION

View file

@ -120,7 +120,7 @@ then
cp -a "$final_path.old/themes/." "$final_path/themes/" cp -a "$final_path.old/themes/." "$final_path/themes/"
# Delete old source # Delete old source
rm -rf "$final_path.old" ynh_secure_remove --file="$final_path.old"
fi fi
#================================================= #=================================================
@ -131,13 +131,6 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
# Create a dedicated NGINX config # Create a dedicated NGINX config
ynh_add_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 # CREATE DEDICATED USER
#================================================= #=================================================