From f73da3f761e937a164188640a70e1693cb897a94 Mon Sep 17 00:00:00 2001 From: ghost Date: Thu, 23 Nov 2023 17:30:03 +0200 Subject: [PATCH] update config tree for opennet --- nginx/opennet/locations.conf | 26 +++++++++---------- .../opennet/{include => }/locations/bsd.conf | 2 +- .../{include => }/locations/cisco.conf | 2 +- .../opennet/{include => }/locations/grab.conf | 2 +- .../locations/include/common.conf | 2 +- .../{include => }/locations/linux.conf | 2 +- nginx/opennet/{include => }/locations/m.conf | 2 +- .../{include => }/locations/mobile.conf | 2 +- .../opennet/{include => }/locations/palm.conf | 2 +- .../{include => }/locations/security.conf | 2 +- .../{include => }/locations/solaris.conf | 2 +- .../opennet/{include => }/locations/web.conf | 2 +- .../opennet/{include => }/locations/wiki.conf | 2 +- .../{include => }/locations/www-less.conf | 2 +- .../opennet/{include => }/locations/www.conf | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-) rename nginx/opennet/{include => }/locations/bsd.conf (85%) rename nginx/opennet/{include => }/locations/cisco.conf (85%) rename nginx/opennet/{include => }/locations/grab.conf (85%) rename nginx/opennet/{include => }/locations/include/common.conf (99%) rename nginx/opennet/{include => }/locations/linux.conf (85%) rename nginx/opennet/{include => }/locations/m.conf (84%) rename nginx/opennet/{include => }/locations/mobile.conf (85%) rename nginx/opennet/{include => }/locations/palm.conf (85%) rename nginx/opennet/{include => }/locations/security.conf (86%) rename nginx/opennet/{include => }/locations/solaris.conf (85%) rename nginx/opennet/{include => }/locations/web.conf (85%) rename nginx/opennet/{include => }/locations/wiki.conf (85%) rename nginx/opennet/{include => }/locations/www-less.conf (84%) rename nginx/opennet/{include => }/locations/www.conf (85%) diff --git a/nginx/opennet/locations.conf b/nginx/opennet/locations.conf index 48e5b3b..1fc95d2 100644 --- a/nginx/opennet/locations.conf +++ b/nginx/opennet/locations.conf @@ -1,38 +1,38 @@ # www-less -include /etc/nginx/opennet/include/locations/www-less.conf; +include /etc/nginx/opennet/locations/www-less.conf; # www -include /etc/nginx/opennet/include/locations/www.conf; +include /etc/nginx/opennet/locations/www.conf; # bsd -include /etc/nginx/opennet/include/locations/bsd.conf; +include /etc/nginx/opennet/locations/bsd.conf; # cisco -include /etc/nginx/opennet/include/locations/cisco.conf; +include /etc/nginx/opennet/locations/cisco.conf; # grab -include /etc/nginx/opennet/include/locations/grab.conf; +include /etc/nginx/opennet/locations/grab.conf; # linux -include /etc/nginx/opennet/include/locations/linux.conf; +include /etc/nginx/opennet/locations/linux.conf; # m -include /etc/nginx/opennet/include/locations/m.conf; +include /etc/nginx/opennet/locations/m.conf; # mobile -include /etc/nginx/opennet/include/locations/mobile.conf; +include /etc/nginx/opennet/locations/mobile.conf; # palm -include /etc/nginx/opennet/include/locations/palm.conf; +include /etc/nginx/opennet/locations/palm.conf; # security -include /etc/nginx/opennet/include/locations/security.conf; +include /etc/nginx/opennet/locations/security.conf; # solaris -include /etc/nginx/opennet/include/locations/solaris.conf; +include /etc/nginx/opennet/locations/solaris.conf; # web -include /etc/nginx/opennet/include/locations/web.conf; +include /etc/nginx/opennet/locations/web.conf; # wiki -include /etc/nginx/opennet/include/locations/wiki.conf; \ No newline at end of file +include /etc/nginx/opennet/locations/wiki.conf; \ No newline at end of file diff --git a/nginx/opennet/include/locations/bsd.conf b/nginx/opennet/locations/bsd.conf similarity index 85% rename from nginx/opennet/include/locations/bsd.conf rename to nginx/opennet/locations/bsd.conf index c6684ca..c3eee78 100644 --- a/nginx/opennet/include/locations/bsd.conf +++ b/nginx/opennet/locations/bsd.conf @@ -4,7 +4,7 @@ location /opennet/bsd { proxy_pass https://bsd.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/bsd/'; diff --git a/nginx/opennet/include/locations/cisco.conf b/nginx/opennet/locations/cisco.conf similarity index 85% rename from nginx/opennet/include/locations/cisco.conf rename to nginx/opennet/locations/cisco.conf index 9eaf0e1..ca4a4f8 100644 --- a/nginx/opennet/include/locations/cisco.conf +++ b/nginx/opennet/locations/cisco.conf @@ -4,7 +4,7 @@ location /opennet/cisco { proxy_pass https://cisco.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/cisco/'; diff --git a/nginx/opennet/include/locations/grab.conf b/nginx/opennet/locations/grab.conf similarity index 85% rename from nginx/opennet/include/locations/grab.conf rename to nginx/opennet/locations/grab.conf index 1440ee7..2a0b8fb 100644 --- a/nginx/opennet/include/locations/grab.conf +++ b/nginx/opennet/locations/grab.conf @@ -4,7 +4,7 @@ location /opennet/grab { proxy_pass https://grab.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/grab/'; diff --git a/nginx/opennet/include/locations/include/common.conf b/nginx/opennet/locations/include/common.conf similarity index 99% rename from nginx/opennet/include/locations/include/common.conf rename to nginx/opennet/locations/include/common.conf index 69373ec..1b9e159 100644 --- a/nginx/opennet/include/locations/include/common.conf +++ b/nginx/opennet/locations/include/common.conf @@ -1,6 +1,6 @@ # Include configuration file # Describes common rules for available locations at -# nginx/opennet/include/locations +# nginx/opennet/locations # Tell to server, that's proxy request proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/opennet/include/locations/linux.conf b/nginx/opennet/locations/linux.conf similarity index 85% rename from nginx/opennet/include/locations/linux.conf rename to nginx/opennet/locations/linux.conf index a4e7a78..887fe31 100644 --- a/nginx/opennet/include/locations/linux.conf +++ b/nginx/opennet/locations/linux.conf @@ -4,7 +4,7 @@ location /opennet/linux { proxy_pass https://linux.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/linux/'; diff --git a/nginx/opennet/include/locations/m.conf b/nginx/opennet/locations/m.conf similarity index 84% rename from nginx/opennet/include/locations/m.conf rename to nginx/opennet/locations/m.conf index 17b461d..d220a6f 100644 --- a/nginx/opennet/include/locations/m.conf +++ b/nginx/opennet/locations/m.conf @@ -4,7 +4,7 @@ location /opennet/m { proxy_pass https://m.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/m/'; diff --git a/nginx/opennet/include/locations/mobile.conf b/nginx/opennet/locations/mobile.conf similarity index 85% rename from nginx/opennet/include/locations/mobile.conf rename to nginx/opennet/locations/mobile.conf index 74519c5..049fa5c 100644 --- a/nginx/opennet/include/locations/mobile.conf +++ b/nginx/opennet/locations/mobile.conf @@ -4,7 +4,7 @@ location /opennet/mobile { proxy_pass https://mobile.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/mobile/'; diff --git a/nginx/opennet/include/locations/palm.conf b/nginx/opennet/locations/palm.conf similarity index 85% rename from nginx/opennet/include/locations/palm.conf rename to nginx/opennet/locations/palm.conf index 494c0a9..38d24a7 100644 --- a/nginx/opennet/include/locations/palm.conf +++ b/nginx/opennet/locations/palm.conf @@ -4,7 +4,7 @@ location /opennet/palm { proxy_pass https://palm.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/palm/'; diff --git a/nginx/opennet/include/locations/security.conf b/nginx/opennet/locations/security.conf similarity index 86% rename from nginx/opennet/include/locations/security.conf rename to nginx/opennet/locations/security.conf index 56c6ea8..7e7241a 100644 --- a/nginx/opennet/include/locations/security.conf +++ b/nginx/opennet/locations/security.conf @@ -4,7 +4,7 @@ location /opennet/security { proxy_pass https://security.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/security/'; diff --git a/nginx/opennet/include/locations/solaris.conf b/nginx/opennet/locations/solaris.conf similarity index 85% rename from nginx/opennet/include/locations/solaris.conf rename to nginx/opennet/locations/solaris.conf index 35cf822..1d1f6a9 100644 --- a/nginx/opennet/include/locations/solaris.conf +++ b/nginx/opennet/locations/solaris.conf @@ -4,7 +4,7 @@ location /opennet/solaris { proxy_pass https://solaris.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/solaris/'; diff --git a/nginx/opennet/include/locations/web.conf b/nginx/opennet/locations/web.conf similarity index 85% rename from nginx/opennet/include/locations/web.conf rename to nginx/opennet/locations/web.conf index 3bbe2fd..06719dd 100644 --- a/nginx/opennet/include/locations/web.conf +++ b/nginx/opennet/locations/web.conf @@ -4,7 +4,7 @@ location /opennet/web { proxy_pass https://web.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/web/'; diff --git a/nginx/opennet/include/locations/wiki.conf b/nginx/opennet/locations/wiki.conf similarity index 85% rename from nginx/opennet/include/locations/wiki.conf rename to nginx/opennet/locations/wiki.conf index 0edc020..d38fa7f 100644 --- a/nginx/opennet/include/locations/wiki.conf +++ b/nginx/opennet/locations/wiki.conf @@ -4,7 +4,7 @@ location /opennet/wiki { proxy_pass https://wiki.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/wiki/'; diff --git a/nginx/opennet/include/locations/www-less.conf b/nginx/opennet/locations/www-less.conf similarity index 84% rename from nginx/opennet/include/locations/www-less.conf rename to nginx/opennet/locations/www-less.conf index 5a6d629..2ce86da 100644 --- a/nginx/opennet/include/locations/www-less.conf +++ b/nginx/opennet/locations/www-less.conf @@ -4,7 +4,7 @@ location /opennet { proxy_pass https://opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/'; diff --git a/nginx/opennet/include/locations/www.conf b/nginx/opennet/locations/www.conf similarity index 85% rename from nginx/opennet/include/locations/www.conf rename to nginx/opennet/locations/www.conf index 373f39d..12adb30 100644 --- a/nginx/opennet/include/locations/www.conf +++ b/nginx/opennet/locations/www.conf @@ -4,7 +4,7 @@ location /opennet/www { proxy_pass https://www.opennet.ru/; # Include common rules - include /etc/nginx/opennet/include/locations/include/common.conf; + include /etc/nginx/opennet/locations/include/common.conf; # Relative paths sub_filter 'href="/' 'href="http://[$server_addr]/opennet/www/';