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

regenconf: the 'plain' subfolder thing for nginx conf is annoying, flatten things up

Browse source
This commit is contained in:
Alexandre Aubin 2024-02-03 18:36:55 +01:00
parent ca835534de
commit 98701ebdab
7 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
conf/nginx/plain/acme-challenge.conf.inc → conf/nginx/acme-challenge.conf.inc
View file

0
conf/nginx/plain/global.conf → conf/nginx/global.conf
View file

0
conf/nginx/plain/ssowat.conf → conf/nginx/ssowat.conf
View file

0
conf/nginx/plain/yunohost_http_errors.conf.inc → conf/nginx/yunohost_http_errors.conf.inc
View file

0
conf/nginx/plain/yunohost_panel.conf.inc → conf/nginx/yunohost_panel.conf.inc
View file

0
conf/nginx/plain/yunohost_sso.conf.inc → conf/nginx/yunohost_sso.conf.inc
View file

18
hooks/conf_regen/15-nginx
View file

@ -4,6 +4,8 @@ set -e
. /usr/share/yunohost/helpers . /usr/share/yunohost/helpers
do_init_regen() { do_init_regen() {
if [[ $EUID -ne 0 ]]; then if [[ $EUID -ne 0 ]]; then
echo "You must be root to run this script" 1>&2 echo "You must be root to run this script" 1>&2
@ -17,7 +19,13 @@ do_init_regen() {
mkdir -p "$nginx_conf_dir" mkdir -p "$nginx_conf_dir"
# install plain conf files # install plain conf files
cp plain/* "$nginx_conf_dir" cp acme-challenge.conf.in "$nginx_conf_dir"
cp global.conf "$nginx_conf_dir"
cp ssowat.conf "$nginx_conf_dir"
cp yunohost_http_errors.conf.inc "$nginx_conf_dir"
cp yunohost_panel.conf.inc "$nginx_conf_dir"
cp yunohost_sso.conf.inc "$nginx_conf_dir"
# probably run with init: just disable default site, restart NGINX and exit # probably run with init: just disable default site, restart NGINX and exit
rm -f "${nginx_dir}/sites-enabled/default" rm -f "${nginx_dir}/sites-enabled/default"
@ -54,7 +62,13 @@ do_pre_regen() {
mkdir -p "$nginx_conf_dir" mkdir -p "$nginx_conf_dir"
# install / update plain conf files # install / update plain conf files
cp plain/* "$nginx_conf_dir" cp acme-challenge.conf.in "$nginx_conf_dir"
cp global.conf "$nginx_conf_dir"
cp ssowat.conf "$nginx_conf_dir"
cp yunohost_http_errors.conf.inc "$nginx_conf_dir"
cp yunohost_panel.conf.inc "$nginx_conf_dir"
cp yunohost_sso.conf.inc "$nginx_conf_dir"
# remove the panel overlay if this is specified in settings # remove the panel overlay if this is specified in settings
panel_overlay="$(jq -r '.ssowat_panel_overlay_enabled' <<< "$YNH_SETTINGS" | int_to_bool)" panel_overlay="$(jq -r '.ssowat_panel_overlay_enabled' <<< "$YNH_SETTINGS" | int_to_bool)"
if [ "$panel_overlay" == "False" ]; then if [ "$panel_overlay" == "False" ]; then