mirror of
https://github.com/YunoHost-Apps/discourse_ynh.git
synced 2024-09-03 18:26:18 +02:00
Merge branch 'testing' into 2.8.4
This commit is contained in:
commit
921c27b6e2
3 changed files with 3 additions and 1 deletions
|
@ -193,7 +193,7 @@ connection_reaper_interval = 30
|
|||
# set to relative URL (for subdirectory hosting)
|
||||
# IMPORTANT: path must not include a trailing /
|
||||
# EG: /forum
|
||||
relative_url_root = "__PATH__"
|
||||
relative_url_root = "__RELATIVE_URL_ROOT__"
|
||||
|
||||
# increasing this number will increase redis memory use
|
||||
# this ensures backlog (ability of channels to catch up are capped)
|
||||
|
|
|
@ -140,6 +140,7 @@ ynh_script_progression --message="Adding a configuration file..."
|
|||
admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
|
||||
redis_db=$(ynh_redis_get_free_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"
|
||||
|
||||
|
|
|
@ -206,6 +206,7 @@ then
|
|||
ynh_script_progression --message="Updating a config file..."
|
||||
|
||||
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/settings.yml" --destination="$final_path/plugins/discourse-ldap-auth/config/settings.yml"
|
||||
|
|
Loading…
Add table
Reference in a new issue