YunoHost-Apps/discourse_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/discourse_ynh.git synced 2024-09-03 18:26:18 +02:00
Code Issues Activity Actions

Merge branch 'testing' into 2.8.4

Browse source
This commit is contained in:
Éric Gaspar 2022-06-16 15:58:42 +02:00 • committed by GitHub
commit 921c27b6e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/discourse_defaults.conf
View file

@ -193,7 +193,7 @@ connection_reaper_interval = 30
# set to relative URL (for subdirectory hosting) # set to relative URL (for subdirectory hosting)
# IMPORTANT: path must not include a trailing / # IMPORTANT: path must not include a trailing /
# EG: /forum # EG: /forum
relative_url_root = "__PATH__" relative_url_root = "__RELATIVE_URL_ROOT__"
# increasing this number will increase redis memory use # increasing this number will increase redis memory use
# this ensures backlog (ability of channels to catch up are capped) # this ensures backlog (ability of channels to catch up are capped)

1
scripts/install
View file

@ -140,6 +140,7 @@ ynh_script_progression --message="Adding a configuration file..."
admin_mail=$(ynh_user_get_info --username=$admin --key=mail) admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
redis_db=$(ynh_redis_get_free_db) redis_db=$(ynh_redis_get_free_db)
ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db"
relative_url_root=${path_url%/}
ynh_add_config --template="../conf/discourse_defaults.conf" --destination="$final_path/config/discourse.conf" ynh_add_config --template="../conf/discourse_defaults.conf" --destination="$final_path/config/discourse.conf"

1
scripts/upgrade
View file

@ -206,6 +206,7 @@ then
ynh_script_progression --message="Updating a config file..." ynh_script_progression --message="Updating a config file..."
admin_mail=$(ynh_user_get_info --username=$admin --key=mail) admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
relative_url_root=${path_url%/}
ynh_add_config --template="../conf/discourse_defaults.conf" --destination="$final_path/config/discourse.conf" ynh_add_config --template="../conf/discourse_defaults.conf" --destination="$final_path/config/discourse.conf"
ynh_add_config --template="../conf/settings.yml" --destination="$final_path/plugins/discourse-ldap-auth/config/settings.yml" ynh_add_config --template="../conf/settings.yml" --destination="$final_path/plugins/discourse-ldap-auth/config/settings.yml"