YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

add instruction to rebuild yunohost-admin conf

Browse source
This commit is contained in:
Romuald du Song 2019-02-14 22:34:35 +01:00
parent e9274ee443
commit 12d0e0e1de
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/hooks/conf_regen/15-nginx
View file

@ -41,6 +41,8 @@ do_pre_regen() {
security_ciphers_compatibility="$(yunohost settings get 'security.ciphers.compatibility')" security_ciphers_compatibility="$(yunohost settings get 'security.ciphers.compatibility')"
fi fi
export security_ciphers_compatibility
# add domain conf files # add domain conf files
for domain in $domain_list; do for domain in $domain_list; do
domain_conf_dir="${nginx_conf_dir}/${domain}.d" domain_conf_dir="${nginx_conf_dir}/${domain}.d"
@ -49,8 +51,6 @@ do_pre_regen() {
mkdir -p "$mail_autoconfig_dir" mkdir -p "$mail_autoconfig_dir"
# NGINX server configuration # NGINX server configuration
echo "RDS Using security_ciphers_compatibility=$security_ciphers_compatibility"
export security_ciphers_compatibility
export domain export domain
export domain_cert_ca=$(yunohost domain cert-status $domain --json \ export domain_cert_ca=$(yunohost domain cert-status $domain --json \
| jq ".certificates.\"$domain\".CA_type" \ | jq ".certificates.\"$domain\".CA_type" \
@ -64,6 +64,7 @@ do_pre_regen() {
|| cp yunohost_local.conf "${domain_conf_dir}/yunohost_local.conf" || cp yunohost_local.conf "${domain_conf_dir}/yunohost_local.conf"
done done
ynh_render_template "plain/yunohost_admin.conf" "${nginx_conf_dir}/yunohost-admin.conf"
# remove old domain conf files # remove old domain conf files
conf_files=$(ls -1 /etc/nginx/conf.d \ conf_files=$(ls -1 /etc/nginx/conf.d \