From eecd1aaa08a6b7419c27b8909eeaadca3e0d0434 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sat, 10 Apr 2021 19:29:50 +0200 Subject: [PATCH] Nginx port_web --- check_process.default | 15 +++++++-------- conf/{UMS.conf => UMS.conf.default} | 0 ...alFolders.conf => VirtualFolders.conf.default} | 0 conf/{WEB.conf => WEB.conf.default} | 0 conf/nginx.conf | 2 +- scripts/install | 8 ++++---- 6 files changed, 12 insertions(+), 13 deletions(-) rename conf/{UMS.conf => UMS.conf.default} (100%) rename conf/{VirtualFolders.conf => VirtualFolders.conf.default} (100%) rename conf/{WEB.conf => WEB.conf.default} (100%) diff --git a/check_process.default b/check_process.default index 7a3ccdd..76337b7 100644 --- a/check_process.default +++ b/check_process.default @@ -7,21 +7,20 @@ ; Manifest domain="domain.tld" (DOMAIN) is_public=1 (PUBLIC|public=1|private=0) - port="666" (PORT) ; Checks pkg_linter=1 #Only work w/ root domain setup_sub_dir=0 setup_root=1 setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - upgrade=1 from_commit=CommitHash - backup_restore=1 + setup_private=0 + setup_public=0 + upgrade=0 + upgrade=0 from_commit=CommitHash + backup_restore= multi_instance=0 - port_already_use=1 - change_url=1 + port_already_use=0 + change_url=0 ;;; Options Email= Notification=none diff --git a/conf/UMS.conf b/conf/UMS.conf.default similarity index 100% rename from conf/UMS.conf rename to conf/UMS.conf.default diff --git a/conf/VirtualFolders.conf b/conf/VirtualFolders.conf.default similarity index 100% rename from conf/VirtualFolders.conf rename to conf/VirtualFolders.conf.default diff --git a/conf/WEB.conf b/conf/WEB.conf.default similarity index 100% rename from conf/WEB.conf rename to conf/WEB.conf.default diff --git a/conf/nginx.conf b/conf/nginx.conf index cb2aac2..c48210b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location __PATH__/ { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $connection_upgrade; more_set_headers "X-Frame-Options: SAMEORIGIN"; - proxy_pass http://localhost:__PORT__/; + proxy_pass http://localhost:__PORT_WEB__/; proxy_set_header Host $host; # Force usage of https diff --git a/scripts/install b/scripts/install index bc80067..b2b107d 100755 --- a/scripts/install +++ b/scripts/install @@ -164,7 +164,7 @@ ynh_script_progression --message="Configuring NGINX web server..." --time --weig ### `ynh_add_nginx_config` will use the file conf/nginx.conf # Create a dedicated NGINX config -ynh_add_nginx_config +ynh_add_nginx_config "port_web" #================================================= @@ -218,9 +218,9 @@ ynh_add_systemd_config ### ynh_replace_string --match_string="match_string" --replace_string="replace_string" --target_file="$final_path/some_config_file" ### ynh_store_file_checksum --file="$final_path/some_config_file" mkdir -p "/home/$app/.config/UMS" -ynh_add_config --template="UMS.conf" --destination="/home/$app/.config/UMS/" -ynh_add_config --template="WEB.conf" --destination="/home/$app/.config/UMS/" -ynh_add_config --template="VirtualFolders.conf" --destination="/home/$app/.config/UMS/" +ynh_add_config --template="UMS.conf.default" --destination="/home/$app/.config/UMS/UMS.conf" +ynh_add_config --template="WEB.conf.default" --destination="/home/$app/.config/UMS/WEB.conf" +ynh_add_config --template="VirtualFolders.conf.default" --destination="/home/$app/.config/UMS/VirtualFolders.conf" chown -R $app:$app "/home/$app/.config" chmod -R 700 "/home/$app/.config" #chmod 600 "/home/$app/.config/UMS/*"