From 1bcd1d943a404c726f1887550acd6ec45e14f830 Mon Sep 17 00:00:00 2001 From: ghost Date: Sun, 3 Dec 2023 20:55:24 +0200 Subject: [PATCH] update opennet location --- README.md | 2 +- nginx/opennet/locations.conf | 38 ------ nginx/opennet/locations/bsd.conf | 15 --- nginx/opennet/locations/cisco.conf | 15 --- nginx/opennet/locations/grab.conf | 15 --- nginx/opennet/locations/include/common.conf | 127 ------------------ nginx/opennet/locations/linux.conf | 15 --- nginx/opennet/locations/m.conf | 15 --- nginx/opennet/locations/mobile.conf | 15 --- nginx/opennet/locations/palm.conf | 15 --- nginx/opennet/locations/security.conf | 15 --- nginx/opennet/locations/solaris.conf | 15 --- nginx/opennet/locations/web.conf | 15 --- nginx/opennet/locations/wiki.conf | 15 --- nginx/opennet/locations/www-less.conf | 15 --- nginx/opennet/locations/www.conf | 15 --- nginx/yggbro/README.md | 3 + nginx/{ => yggbro}/opennet/README.md | 2 +- .../opennet/handles/redirect.conf | 2 +- nginx/yggbro/opennet/locations.conf | 38 ++++++ nginx/yggbro/opennet/locations/bsd.conf | 15 +++ nginx/yggbro/opennet/locations/cisco.conf | 15 +++ nginx/yggbro/opennet/locations/grab.conf | 15 +++ .../opennet/locations/include/common.conf | 127 ++++++++++++++++++ nginx/yggbro/opennet/locations/linux.conf | 15 +++ nginx/yggbro/opennet/locations/m.conf | 15 +++ nginx/yggbro/opennet/locations/mobile.conf | 15 +++ nginx/yggbro/opennet/locations/palm.conf | 15 +++ nginx/yggbro/opennet/locations/security.conf | 15 +++ nginx/yggbro/opennet/locations/solaris.conf | 15 +++ nginx/yggbro/opennet/locations/web.conf | 15 +++ nginx/yggbro/opennet/locations/wiki.conf | 15 +++ nginx/yggbro/opennet/locations/www-less.conf | 15 +++ nginx/yggbro/opennet/locations/www.conf | 15 +++ nginx/{ => yggbro}/opennet/server.conf | 4 +- 35 files changed, 368 insertions(+), 365 deletions(-) delete mode 100644 nginx/opennet/locations.conf delete mode 100644 nginx/opennet/locations/bsd.conf delete mode 100644 nginx/opennet/locations/cisco.conf delete mode 100644 nginx/opennet/locations/grab.conf delete mode 100644 nginx/opennet/locations/include/common.conf delete mode 100644 nginx/opennet/locations/linux.conf delete mode 100644 nginx/opennet/locations/m.conf delete mode 100644 nginx/opennet/locations/mobile.conf delete mode 100644 nginx/opennet/locations/palm.conf delete mode 100644 nginx/opennet/locations/security.conf delete mode 100644 nginx/opennet/locations/solaris.conf delete mode 100644 nginx/opennet/locations/web.conf delete mode 100644 nginx/opennet/locations/wiki.conf delete mode 100644 nginx/opennet/locations/www-less.conf delete mode 100644 nginx/opennet/locations/www.conf create mode 100644 nginx/yggbro/README.md rename nginx/{ => yggbro}/opennet/README.md (90%) rename nginx/{ => yggbro}/opennet/handles/redirect.conf (71%) create mode 100644 nginx/yggbro/opennet/locations.conf create mode 100644 nginx/yggbro/opennet/locations/bsd.conf create mode 100644 nginx/yggbro/opennet/locations/cisco.conf create mode 100644 nginx/yggbro/opennet/locations/grab.conf create mode 100644 nginx/yggbro/opennet/locations/include/common.conf create mode 100644 nginx/yggbro/opennet/locations/linux.conf create mode 100644 nginx/yggbro/opennet/locations/m.conf create mode 100644 nginx/yggbro/opennet/locations/mobile.conf create mode 100644 nginx/yggbro/opennet/locations/palm.conf create mode 100644 nginx/yggbro/opennet/locations/security.conf create mode 100644 nginx/yggbro/opennet/locations/solaris.conf create mode 100644 nginx/yggbro/opennet/locations/web.conf create mode 100644 nginx/yggbro/opennet/locations/wiki.conf create mode 100644 nginx/yggbro/opennet/locations/www-less.conf create mode 100644 nginx/yggbro/opennet/locations/www.conf rename nginx/{ => yggbro}/opennet/server.conf (58%) diff --git a/README.md b/README.md index ae20d8b..9c5fefb 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ This repository maintained by community, feel free to share your fixes, configur ## Contribution -* Grab latest YGGbro version `git clone https://github.com/YGGverse/YGGbro.git` +* Get latest YGGbro version `git clone https://github.com/YGGverse/YGGbro.git` * Navigate to repo folder `cd YGGbro` * Make sure `git checkout master`, create new branch for new PR `git checkout -b some-provider-name` diff --git a/nginx/opennet/locations.conf b/nginx/opennet/locations.conf deleted file mode 100644 index 1fe4e57..0000000 --- a/nginx/opennet/locations.conf +++ /dev/null @@ -1,38 +0,0 @@ -# www-less -include /etc/yggbro/nginx/opennet/locations/www-less.conf; - -# www -include /etc/yggbro/nginx/opennet/locations/www.conf; - -# bsd -include /etc/yggbro/nginx/opennet/locations/bsd.conf; - -# cisco -include /etc/yggbro/nginx/opennet/locations/cisco.conf; - -# grab -include /etc/yggbro/nginx/opennet/locations/grab.conf; - -# linux -include /etc/yggbro/nginx/opennet/locations/linux.conf; - -# m -include /etc/yggbro/nginx/opennet/locations/m.conf; - -# mobile -include /etc/yggbro/nginx/opennet/locations/mobile.conf; - -# palm -include /etc/yggbro/nginx/opennet/locations/palm.conf; - -# security -include /etc/yggbro/nginx/opennet/locations/security.conf; - -# solaris -include /etc/yggbro/nginx/opennet/locations/solaris.conf; - -# web -include /etc/yggbro/nginx/opennet/locations/web.conf; - -# wiki -include /etc/yggbro/nginx/opennet/locations/wiki.conf; \ No newline at end of file diff --git a/nginx/opennet/locations/bsd.conf b/nginx/opennet/locations/bsd.conf deleted file mode 100644 index 8f2d8bb..0000000 --- a/nginx/opennet/locations/bsd.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/bsd { - - # Domain source - proxy_pass https://bsd.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/bsd/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/bsd/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/bsd/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/bsd/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/bsd/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/cisco.conf b/nginx/opennet/locations/cisco.conf deleted file mode 100644 index 5b387c0..0000000 --- a/nginx/opennet/locations/cisco.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/cisco { - - # Domain source - proxy_pass https://cisco.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/cisco/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/cisco/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/cisco/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/cisco/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/cisco/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/grab.conf b/nginx/opennet/locations/grab.conf deleted file mode 100644 index ac3fe7b..0000000 --- a/nginx/opennet/locations/grab.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/grab { - - # Domain source - proxy_pass https://grab.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/grab/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/grab/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/grab/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/grab/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/grab/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/include/common.conf b/nginx/opennet/locations/include/common.conf deleted file mode 100644 index 01c7ab2..0000000 --- a/nginx/opennet/locations/include/common.conf +++ /dev/null @@ -1,127 +0,0 @@ -# Include configuration file -# Describes common rules for available locations at -# nginx/opennet/locations - -# Tell to server, that's proxy request -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_set_header X-Real-IP $remote_addr; - -# Prevent out redirects (issue #2) -proxy_intercept_errors on; -error_page 301 302 307 = @yggbro_nginx_opennet_handles_redirect; - -# Replace all matches -sub_filter_once off; - -# Enable multimedia replacement -sub_filter_types *; - -# Disable JS / trackers by default -sub_filter '' ' -->'; - -# Feedback link to project repository -sub_filter '' 'YGGbro'; - -# Links - -# . -sub_filter 'http://opennet.ru' 'http://[$server_addr]/opennet'; -sub_filter 'https://opennet.ru' 'http://[$server_addr]/opennet'; - -sub_filter 'http://opennet.me' 'http://[$server_addr]/opennet'; -sub_filter 'https://opennet.me' 'http://[$server_addr]/opennet'; - -# www -sub_filter 'http://www.opennet.ru' 'http://[$server_addr]/opennet/www'; -sub_filter 'https://www.opennet.ru' 'http://[$server_addr]/opennet/www'; - -sub_filter 'http://www.opennet.me' 'http://[$server_addr]/opennet/www'; -sub_filter 'https://www.opennet.me' 'http://[$server_addr]/opennet/www'; - -# m -sub_filter 'http://m.opennet.ru' 'http://[$server_addr]/opennet/m'; -sub_filter 'https://m.opennet.ru' 'http://[$server_addr]/opennet/m'; - -sub_filter 'http://m.opennet.me' 'http://[$server_addr]/opennet/m'; -sub_filter 'https://m.opennet.me' 'http://[$server_addr]/opennet/m'; - -# mobile -sub_filter 'http://mobile.opennet.ru' 'http://[$server_addr]/opennet/mobile'; -sub_filter 'https://mobile.opennet.ru' 'http://[$server_addr]/opennet/mobile'; - -sub_filter 'http://mobile.opennet.me' 'http://[$server_addr]/opennet/mobile'; -sub_filter 'https://mobile.opennet.me' 'http://[$server_addr]/opennet/mobile'; - -# wiki -sub_filter 'http://wiki.opennet.ru' 'http://[$server_addr]/opennet/wiki'; -sub_filter 'https://wiki.opennet.ru' 'http://[$server_addr]/opennet/wiki'; - -sub_filter 'http://wiki.opennet.me' 'http://[$server_addr]/opennet/wiki'; -sub_filter 'https://wiki.opennet.me' 'http://[$server_addr]/opennet/wiki'; - -# solaris -sub_filter 'http://solaris.opennet.ru' 'http://[$server_addr]/opennet/solaris'; -sub_filter 'https://solaris.opennet.ru' 'http://[$server_addr]/opennet/solaris'; - -sub_filter 'http://solaris.opennet.me' 'http://[$server_addr]/opennet/solaris'; -sub_filter 'https://solaris.opennet.me' 'http://[$server_addr]/opennet/solaris'; - -# bsd -sub_filter 'http://bsd.opennet.ru' 'http://[$server_addr]/opennet/bsd'; -sub_filter 'https://bsd.opennet.ru' 'http://[$server_addr]/opennet/bsd'; - -sub_filter 'http://bsd.opennet.me' 'http://[$server_addr]/opennet/bsd'; -sub_filter 'https://bsd.opennet.me' 'http://[$server_addr]/opennet/bsd'; - -# cisco -sub_filter 'http://cisco.opennet.ru' 'http://[$server_addr]/opennet/cisco'; -sub_filter 'https://cisco.opennet.ru' 'http://[$server_addr]/opennet/cisco'; - -sub_filter 'http://cisco.opennet.me' 'http://[$server_addr]/opennet/cisco'; -sub_filter 'https://cisco.opennet.me' 'http://[$server_addr]/opennet/cisco'; - -# linux -sub_filter 'http://linux.opennet.ru' 'http://[$server_addr]/opennet/linux'; -sub_filter 'https://linux.opennet.ru' 'http://[$server_addr]/opennet/linux'; - -sub_filter 'http://linux.opennet.me' 'http://[$server_addr]/opennet/linux'; -sub_filter 'https://linux.opennet.me' 'http://[$server_addr]/opennet/linux'; - -# web -sub_filter 'http://web.opennet.ru' 'http://[$server_addr]/opennet/web'; -sub_filter 'https://web.opennet.ru' 'http://[$server_addr]/opennet/web'; - -sub_filter 'http://web.opennet.me' 'http://[$server_addr]/opennet/web'; -sub_filter 'https://web.opennet.me' 'http://[$server_addr]/opennet/web'; - -# security -sub_filter 'http://security.opennet.ru' 'http://[$server_addr]/opennet/security'; -sub_filter 'https://security.opennet.ru' 'http://[$server_addr]/opennet/security'; - -sub_filter 'http://security.opennet.me' 'http://[$server_addr]/opennet/security'; -sub_filter 'https://security.opennet.me' 'http://[$server_addr]/opennet/security'; - -# palm -sub_filter 'http://palm.opennet.ru' 'http://[$server_addr]/opennet/palm'; -sub_filter 'https://palm.opennet.ru' 'http://[$server_addr]/opennet/palm'; - -sub_filter 'http://palm.opennet.me' 'http://[$server_addr]/opennet/palm'; -sub_filter 'https://palm.opennet.me' 'http://[$server_addr]/opennet/palm'; - -# grab -sub_filter 'http://grab.opennet.ru' 'http://[$server_addr]/opennet/grab'; -sub_filter 'https://grab.opennet.ru' 'http://[$server_addr]/opennet/grab'; - -sub_filter 'http://grab.opennet.me' 'http://[$server_addr]/opennet/grab'; -sub_filter 'https://grab.opennet.me' 'http://[$server_addr]/opennet/grab'; - -# forum -sub_filter 'http://forum.opennet.ru' 'http://[$server_addr]/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; -sub_filter 'https://forum.opennet.ru' 'http://[$server_addr]/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; - -sub_filter 'http://forum.opennet.me' 'http://[$server_addr]/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; -sub_filter 'https://forum.opennet.me' 'http://[$server_addr]/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; - -sub_filter '/forum' '/cgi-bin/openforum/vsluhboard.cgi'; -sub_filter './forum' 'http://[$server_addr]/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; \ No newline at end of file diff --git a/nginx/opennet/locations/linux.conf b/nginx/opennet/locations/linux.conf deleted file mode 100644 index ff63db3..0000000 --- a/nginx/opennet/locations/linux.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/linux { - - # Domain source - proxy_pass https://linux.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/linux/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/linux/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/linux/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/linux/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/linux/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/m.conf b/nginx/opennet/locations/m.conf deleted file mode 100644 index 63cd290..0000000 --- a/nginx/opennet/locations/m.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/m { - - # Domain source - proxy_pass https://m.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/m/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/m/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/m/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/m/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/m/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/mobile.conf b/nginx/opennet/locations/mobile.conf deleted file mode 100644 index 29d78e1..0000000 --- a/nginx/opennet/locations/mobile.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/mobile { - - # Domain source - proxy_pass https://mobile.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/mobile/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/mobile/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/mobile/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/mobile/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/mobile/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/palm.conf b/nginx/opennet/locations/palm.conf deleted file mode 100644 index 673f738..0000000 --- a/nginx/opennet/locations/palm.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/palm { - - # Domain source - proxy_pass https://palm.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/palm/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/palm/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/palm/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/palm/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/palm/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/security.conf b/nginx/opennet/locations/security.conf deleted file mode 100644 index 0a75a6d..0000000 --- a/nginx/opennet/locations/security.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/security { - - # Domain source - proxy_pass https://security.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/security/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/security/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/security/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/security/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/security/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/solaris.conf b/nginx/opennet/locations/solaris.conf deleted file mode 100644 index 7258fd0..0000000 --- a/nginx/opennet/locations/solaris.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/solaris { - - # Domain source - proxy_pass https://solaris.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/solaris/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/solaris/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/solaris/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/solaris/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/solaris/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/web.conf b/nginx/opennet/locations/web.conf deleted file mode 100644 index 430c058..0000000 --- a/nginx/opennet/locations/web.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/web { - - # Domain source - proxy_pass https://web.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/web/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/web/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/web/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/web/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/web/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/wiki.conf b/nginx/opennet/locations/wiki.conf deleted file mode 100644 index 1d98691..0000000 --- a/nginx/opennet/locations/wiki.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/wiki { - - # Domain source - proxy_pass https://wiki.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/wiki/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/wiki/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/wiki/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/wiki/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/wiki/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/www-less.conf b/nginx/opennet/locations/www-less.conf deleted file mode 100644 index d68a9ce..0000000 --- a/nginx/opennet/locations/www-less.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet { - - # Domain source - proxy_pass https://opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/opennet/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/"; -} \ No newline at end of file diff --git a/nginx/opennet/locations/www.conf b/nginx/opennet/locations/www.conf deleted file mode 100644 index 236cb14..0000000 --- a/nginx/opennet/locations/www.conf +++ /dev/null @@ -1,15 +0,0 @@ -location /opennet/www { - - # Domain source - proxy_pass https://www.opennet.ru/; - - # Include common rules - include /etc/yggbro/nginx/opennet/locations/include/common.conf; - - # Relative paths - sub_filter 'action="/' 'action="http://[$server_addr]/opennet/www/'; - sub_filter 'href="/' 'href="http://[$server_addr]/opennet/www/'; - sub_filter 'src="/' 'src="http://[$server_addr]/opennet/www/'; - sub_filter 'data-src="/' 'src="http://[$server_addr]/opennet/www/'; - sub_filter "url('/" "url('http://[$server_addr]/opennet/www/"; -} \ No newline at end of file diff --git a/nginx/yggbro/README.md b/nginx/yggbro/README.md new file mode 100644 index 0000000..05e6857 --- /dev/null +++ b/nginx/yggbro/README.md @@ -0,0 +1,3 @@ +# Nginx proxy configuration for /yggbro subdirectory + +Follow subfolder instructions to enable. \ No newline at end of file diff --git a/nginx/opennet/README.md b/nginx/yggbro/opennet/README.md similarity index 90% rename from nginx/opennet/README.md rename to nginx/yggbro/opennet/README.md index 13d270b..aecf57a 100644 --- a/nginx/opennet/README.md +++ b/nginx/yggbro/opennet/README.md @@ -19,7 +19,7 @@ Current implementation forward subdomains to following proxy locations: ## Install -* `ln -s /etc/yggbro/nginx/opennet/server.conf /etc/nginx/sites-enabled/yggbro.opennet.conf` +* `ln -s /etc/yggbro/nginx/yggbro/opennet/server.conf /etc/nginx/sites-enabled/yggbro.opennet.conf` * `nginx -t` * `service nginx reload` diff --git a/nginx/opennet/handles/redirect.conf b/nginx/yggbro/opennet/handles/redirect.conf similarity index 71% rename from nginx/opennet/handles/redirect.conf rename to nginx/yggbro/opennet/handles/redirect.conf index 16ea617..42f25fc 100644 --- a/nginx/opennet/handles/redirect.conf +++ b/nginx/yggbro/opennet/handles/redirect.conf @@ -1,6 +1,6 @@ # Prevent out redirects (solution for issue #2) -location @yggbro_nginx_opennet_handles_redirect { +location @yggbro_nginx_yggbro_opennet_handles_redirect { set $original_uri $uri; set $orig_loc $upstream_http_location; diff --git a/nginx/yggbro/opennet/locations.conf b/nginx/yggbro/opennet/locations.conf new file mode 100644 index 0000000..07d9e7e --- /dev/null +++ b/nginx/yggbro/opennet/locations.conf @@ -0,0 +1,38 @@ +# www-less +include /etc/yggbro/nginx/yggbro/opennet/locations/www-less.conf; + +# www +include /etc/yggbro/nginx/yggbro/opennet/locations/www.conf; + +# bsd +include /etc/yggbro/nginx/yggbro/opennet/locations/bsd.conf; + +# cisco +include /etc/yggbro/nginx/yggbro/opennet/locations/cisco.conf; + +# grab +include /etc/yggbro/nginx/yggbro/opennet/locations/grab.conf; + +# linux +include /etc/yggbro/nginx/yggbro/opennet/locations/linux.conf; + +# m +include /etc/yggbro/nginx/yggbro/opennet/locations/m.conf; + +# mobile +include /etc/yggbro/nginx/yggbro/opennet/locations/mobile.conf; + +# palm +include /etc/yggbro/nginx/yggbro/opennet/locations/palm.conf; + +# security +include /etc/yggbro/nginx/yggbro/opennet/locations/security.conf; + +# solaris +include /etc/yggbro/nginx/yggbro/opennet/locations/solaris.conf; + +# web +include /etc/yggbro/nginx/yggbro/opennet/locations/web.conf; + +# wiki +include /etc/yggbro/nginx/yggbro/opennet/locations/wiki.conf; \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/bsd.conf b/nginx/yggbro/opennet/locations/bsd.conf new file mode 100644 index 0000000..c3c1c6f --- /dev/null +++ b/nginx/yggbro/opennet/locations/bsd.conf @@ -0,0 +1,15 @@ +location /opennet/bsd { + + # Domain source + proxy_pass https://bsd.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/bsd/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/bsd/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/bsd/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/bsd/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/bsd/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/cisco.conf b/nginx/yggbro/opennet/locations/cisco.conf new file mode 100644 index 0000000..757e450 --- /dev/null +++ b/nginx/yggbro/opennet/locations/cisco.conf @@ -0,0 +1,15 @@ +location /opennet/cisco { + + # Domain source + proxy_pass https://cisco.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/cisco/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/cisco/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/cisco/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/cisco/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/cisco/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/grab.conf b/nginx/yggbro/opennet/locations/grab.conf new file mode 100644 index 0000000..f7e27fe --- /dev/null +++ b/nginx/yggbro/opennet/locations/grab.conf @@ -0,0 +1,15 @@ +location /opennet/grab { + + # Domain source + proxy_pass https://grab.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/grab/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/grab/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/grab/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/grab/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/grab/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/include/common.conf b/nginx/yggbro/opennet/locations/include/common.conf new file mode 100644 index 0000000..6476579 --- /dev/null +++ b/nginx/yggbro/opennet/locations/include/common.conf @@ -0,0 +1,127 @@ +# Include configuration file +# Describes common rules for available locations at +# nginx/opennet/locations + +# Tell to server, that's proxy request +proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +proxy_set_header X-Real-IP $remote_addr; + +# Prevent out redirects (issue #2) +proxy_intercept_errors on; +error_page 301 302 307 = @yggbro_nginx_yggbro_opennet_handles_redirect; + +# Replace all matches +sub_filter_once off; + +# Enable multimedia replacement +sub_filter_types *; + +# Disable JS / trackers by default +sub_filter '' ' -->'; + +# Feedback link to project repository +sub_filter '' 'YGGbro'; + +# Links + +# . +sub_filter 'http://opennet.ru' 'http://[$server_addr]/yggbro/opennet'; +sub_filter 'https://opennet.ru' 'http://[$server_addr]/yggbro/opennet'; + +sub_filter 'http://opennet.me' 'http://[$server_addr]/yggbro/opennet'; +sub_filter 'https://opennet.me' 'http://[$server_addr]/yggbro/opennet'; + +# www +sub_filter 'http://www.opennet.ru' 'http://[$server_addr]/yggbro/opennet/www'; +sub_filter 'https://www.opennet.ru' 'http://[$server_addr]/yggbro/opennet/www'; + +sub_filter 'http://www.opennet.me' 'http://[$server_addr]/yggbro/opennet/www'; +sub_filter 'https://www.opennet.me' 'http://[$server_addr]/yggbro/opennet/www'; + +# m +sub_filter 'http://m.opennet.ru' 'http://[$server_addr]/yggbro/opennet/m'; +sub_filter 'https://m.opennet.ru' 'http://[$server_addr]/yggbro/opennet/m'; + +sub_filter 'http://m.opennet.me' 'http://[$server_addr]/yggbro/opennet/m'; +sub_filter 'https://m.opennet.me' 'http://[$server_addr]/yggbro/opennet/m'; + +# mobile +sub_filter 'http://mobile.opennet.ru' 'http://[$server_addr]/yggbro/opennet/mobile'; +sub_filter 'https://mobile.opennet.ru' 'http://[$server_addr]/yggbro/opennet/mobile'; + +sub_filter 'http://mobile.opennet.me' 'http://[$server_addr]/yggbro/opennet/mobile'; +sub_filter 'https://mobile.opennet.me' 'http://[$server_addr]/yggbro/opennet/mobile'; + +# wiki +sub_filter 'http://wiki.opennet.ru' 'http://[$server_addr]/yggbro/opennet/wiki'; +sub_filter 'https://wiki.opennet.ru' 'http://[$server_addr]/yggbro/opennet/wiki'; + +sub_filter 'http://wiki.opennet.me' 'http://[$server_addr]/yggbro/opennet/wiki'; +sub_filter 'https://wiki.opennet.me' 'http://[$server_addr]/yggbro/opennet/wiki'; + +# solaris +sub_filter 'http://solaris.opennet.ru' 'http://[$server_addr]/yggbro/opennet/solaris'; +sub_filter 'https://solaris.opennet.ru' 'http://[$server_addr]/yggbro/opennet/solaris'; + +sub_filter 'http://solaris.opennet.me' 'http://[$server_addr]/yggbro/opennet/solaris'; +sub_filter 'https://solaris.opennet.me' 'http://[$server_addr]/yggbro/opennet/solaris'; + +# bsd +sub_filter 'http://bsd.opennet.ru' 'http://[$server_addr]/yggbro/opennet/bsd'; +sub_filter 'https://bsd.opennet.ru' 'http://[$server_addr]/yggbro/opennet/bsd'; + +sub_filter 'http://bsd.opennet.me' 'http://[$server_addr]/yggbro/opennet/bsd'; +sub_filter 'https://bsd.opennet.me' 'http://[$server_addr]/yggbro/opennet/bsd'; + +# cisco +sub_filter 'http://cisco.opennet.ru' 'http://[$server_addr]/yggbro/opennet/cisco'; +sub_filter 'https://cisco.opennet.ru' 'http://[$server_addr]/yggbro/opennet/cisco'; + +sub_filter 'http://cisco.opennet.me' 'http://[$server_addr]/yggbro/opennet/cisco'; +sub_filter 'https://cisco.opennet.me' 'http://[$server_addr]/yggbro/opennet/cisco'; + +# linux +sub_filter 'http://linux.opennet.ru' 'http://[$server_addr]/yggbro/opennet/linux'; +sub_filter 'https://linux.opennet.ru' 'http://[$server_addr]/yggbro/opennet/linux'; + +sub_filter 'http://linux.opennet.me' 'http://[$server_addr]/yggbro/opennet/linux'; +sub_filter 'https://linux.opennet.me' 'http://[$server_addr]/yggbro/opennet/linux'; + +# web +sub_filter 'http://web.opennet.ru' 'http://[$server_addr]/yggbro/opennet/web'; +sub_filter 'https://web.opennet.ru' 'http://[$server_addr]/yggbro/opennet/web'; + +sub_filter 'http://web.opennet.me' 'http://[$server_addr]/yggbro/opennet/web'; +sub_filter 'https://web.opennet.me' 'http://[$server_addr]/yggbro/opennet/web'; + +# security +sub_filter 'http://security.opennet.ru' 'http://[$server_addr]/yggbro/opennet/security'; +sub_filter 'https://security.opennet.ru' 'http://[$server_addr]/yggbro/opennet/security'; + +sub_filter 'http://security.opennet.me' 'http://[$server_addr]/yggbro/opennet/security'; +sub_filter 'https://security.opennet.me' 'http://[$server_addr]/yggbro/opennet/security'; + +# palm +sub_filter 'http://palm.opennet.ru' 'http://[$server_addr]/yggbro/opennet/palm'; +sub_filter 'https://palm.opennet.ru' 'http://[$server_addr]/yggbro/opennet/palm'; + +sub_filter 'http://palm.opennet.me' 'http://[$server_addr]/yggbro/opennet/palm'; +sub_filter 'https://palm.opennet.me' 'http://[$server_addr]/yggbro/opennet/palm'; + +# grab +sub_filter 'http://grab.opennet.ru' 'http://[$server_addr]/yggbro/opennet/grab'; +sub_filter 'https://grab.opennet.ru' 'http://[$server_addr]/yggbro/opennet/grab'; + +sub_filter 'http://grab.opennet.me' 'http://[$server_addr]/yggbro/opennet/grab'; +sub_filter 'https://grab.opennet.me' 'http://[$server_addr]/yggbro/opennet/grab'; + +# forum +sub_filter 'http://forum.opennet.ru' 'http://[$server_addr]/yggbro/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; +sub_filter 'https://forum.opennet.ru' 'http://[$server_addr]/yggbro/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; + +sub_filter 'http://forum.opennet.me' 'http://[$server_addr]/yggbro/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; +sub_filter 'https://forum.opennet.me' 'http://[$server_addr]/yggbro/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; + +sub_filter '/forum' '/cgi-bin/openforum/vsluhboard.cgi'; +sub_filter './forum' 'http://[$server_addr]/yggbro/opennet/wwwcgi-bin/openforum/vsluhboard.cgi'; \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/linux.conf b/nginx/yggbro/opennet/locations/linux.conf new file mode 100644 index 0000000..df470d5 --- /dev/null +++ b/nginx/yggbro/opennet/locations/linux.conf @@ -0,0 +1,15 @@ +location /opennet/linux { + + # Domain source + proxy_pass https://linux.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/linux/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/linux/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/linux/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/linux/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/linux/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/m.conf b/nginx/yggbro/opennet/locations/m.conf new file mode 100644 index 0000000..caa5f28 --- /dev/null +++ b/nginx/yggbro/opennet/locations/m.conf @@ -0,0 +1,15 @@ +location /opennet/m { + + # Domain source + proxy_pass https://m.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/m/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/m/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/m/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/m/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/m/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/mobile.conf b/nginx/yggbro/opennet/locations/mobile.conf new file mode 100644 index 0000000..bc1de88 --- /dev/null +++ b/nginx/yggbro/opennet/locations/mobile.conf @@ -0,0 +1,15 @@ +location /opennet/mobile { + + # Domain source + proxy_pass https://mobile.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/mobile/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/mobile/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/mobile/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/mobile/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/mobile/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/palm.conf b/nginx/yggbro/opennet/locations/palm.conf new file mode 100644 index 0000000..85c6834 --- /dev/null +++ b/nginx/yggbro/opennet/locations/palm.conf @@ -0,0 +1,15 @@ +location /opennet/palm { + + # Domain source + proxy_pass https://palm.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/palm/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/palm/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/palm/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/palm/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/palm/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/security.conf b/nginx/yggbro/opennet/locations/security.conf new file mode 100644 index 0000000..fcff688 --- /dev/null +++ b/nginx/yggbro/opennet/locations/security.conf @@ -0,0 +1,15 @@ +location /opennet/security { + + # Domain source + proxy_pass https://security.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/security/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/security/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/security/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/security/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/security/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/solaris.conf b/nginx/yggbro/opennet/locations/solaris.conf new file mode 100644 index 0000000..179eaa8 --- /dev/null +++ b/nginx/yggbro/opennet/locations/solaris.conf @@ -0,0 +1,15 @@ +location /opennet/solaris { + + # Domain source + proxy_pass https://solaris.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/solaris/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/solaris/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/solaris/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/solaris/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/solaris/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/web.conf b/nginx/yggbro/opennet/locations/web.conf new file mode 100644 index 0000000..01a7f0b --- /dev/null +++ b/nginx/yggbro/opennet/locations/web.conf @@ -0,0 +1,15 @@ +location /opennet/web { + + # Domain source + proxy_pass https://web.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/web/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/web/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/web/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/web/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/web/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/wiki.conf b/nginx/yggbro/opennet/locations/wiki.conf new file mode 100644 index 0000000..af257ba --- /dev/null +++ b/nginx/yggbro/opennet/locations/wiki.conf @@ -0,0 +1,15 @@ +location /opennet/wiki { + + # Domain source + proxy_pass https://wiki.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/wiki/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/wiki/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/wiki/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/wiki/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/wiki/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/www-less.conf b/nginx/yggbro/opennet/locations/www-less.conf new file mode 100644 index 0000000..76c7052 --- /dev/null +++ b/nginx/yggbro/opennet/locations/www-less.conf @@ -0,0 +1,15 @@ +location /opennet { + + # Domain source + proxy_pass https://opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/opennet/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/"; +} \ No newline at end of file diff --git a/nginx/yggbro/opennet/locations/www.conf b/nginx/yggbro/opennet/locations/www.conf new file mode 100644 index 0000000..3699407 --- /dev/null +++ b/nginx/yggbro/opennet/locations/www.conf @@ -0,0 +1,15 @@ +location /opennet/www { + + # Domain source + proxy_pass https://www.opennet.ru/; + + # Include common rules + include /etc/yggbro/nginx/yggbro/opennet/locations/include/common.conf; + + # Relative paths + sub_filter 'action="/' 'action="http://[$server_addr]/yggbro/opennet/www/'; + sub_filter 'href="/' 'href="http://[$server_addr]/yggbro/opennet/www/'; + sub_filter 'src="/' 'src="http://[$server_addr]/yggbro/opennet/www/'; + sub_filter 'data-src="/' 'src="http://[$server_addr]/yggbro/opennet/www/'; + sub_filter "url('/" "url('http://[$server_addr]/yggbro/opennet/www/"; +} \ No newline at end of file diff --git a/nginx/opennet/server.conf b/nginx/yggbro/opennet/server.conf similarity index 58% rename from nginx/opennet/server.conf rename to nginx/yggbro/opennet/server.conf index 7cc922a..0c2e208 100644 --- a/nginx/opennet/server.conf +++ b/nginx/yggbro/opennet/server.conf @@ -8,8 +8,8 @@ server { deny all; # Include handles - include /etc/yggbro/nginx/opennet/handles/redirect.conf; + include /etc/yggbro/nginx/yggbro/opennet/handles/redirect.conf; # Include available locations - include /etc/yggbro/nginx/opennet/locations.conf; + include /etc/yggbro/nginx/yggbro/opennet/locations.conf; } \ No newline at end of file