From 9bf9cd8bf0d52f07e7bcb8a1f4d8b792c3274729 Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Mon, 21 Mar 2016 19:10:45 +0100 Subject: FIX FAX APACHE NMS PUBLIC --- web/etc/apache2/nms-public.tg15.gathering.org.conf | 21 --------------------- web/etc/apache2/nms.tg16.gathering.org.conf | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 web/etc/apache2/nms-public.tg15.gathering.org.conf (limited to 'web/etc/apache2') diff --git a/web/etc/apache2/nms-public.tg15.gathering.org.conf b/web/etc/apache2/nms-public.tg15.gathering.org.conf deleted file mode 100644 index 6ca255d..0000000 --- a/web/etc/apache2/nms-public.tg15.gathering.org.conf +++ /dev/null @@ -1,21 +0,0 @@ - - ServerAdmin drift@gathering.org - ServerName nms-public.tg15.gathering.org - - DocumentRoot /root/tgmanage/web/nms-public.gathering.org - AddHandler cgi-script .cgi .sh .pl .py - - LogLevel warn - ErrorLog /var/log/apache2/error-nms-public.tg15.gathering.org.log - CustomLog /var/log/apache2/access-nms-public.tg15.gathering.org.log combined - - - AllowOverride None - Options Indexes FollowSymLinks ExecCGI MultiViews - - Require all granted - - - ServerSignature On - - diff --git a/web/etc/apache2/nms.tg16.gathering.org.conf b/web/etc/apache2/nms.tg16.gathering.org.conf index 9a6d7cd..1c1d7e3 100644 --- a/web/etc/apache2/nms.tg16.gathering.org.conf +++ b/web/etc/apache2/nms.tg16.gathering.org.conf @@ -1,7 +1,7 @@ ServerAdmin drift@gathering.org ServerName nms.tg16.gathering.org - ServerAlias einstein.tg16.gathering.org + ServerAlias nms.tg16.gathering.org DocumentRoot /srv/tgmanage/web/nms.gathering.org ScriptAlias /api/private/ /srv/tgmanage/web/nms.gathering.org/api/private/ -- cgit v1.2.3 From 727e4ab31aa6d1a754711d4cd29dbcefae2e952a Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Mon, 21 Mar 2016 20:11:55 +0100 Subject: NMS: NMS Public --- web/etc/apache2/nms-public.tg16.gathering.org.conf | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 web/etc/apache2/nms-public.tg16.gathering.org.conf (limited to 'web/etc/apache2') diff --git a/web/etc/apache2/nms-public.tg16.gathering.org.conf b/web/etc/apache2/nms-public.tg16.gathering.org.conf new file mode 100644 index 0000000..7e24b5c --- /dev/null +++ b/web/etc/apache2/nms-public.tg16.gathering.org.conf @@ -0,0 +1,30 @@ + + ServerAdmin drift@gathering.org + ServerName nms-public.tg16.gathering.org + ServerAlias nms-public.tg16.gathering.org + + DocumentRoot /srv/tgmanage/web/nms-public.gathering.org + ScriptAlias /api/public/ /srv/tgmanage/web/nms-public.gathering.org/api/public/ + + AllowOverride None + Options +ExecCGI -MultiViews +Indexes +SymLinksIfOwnerMatch + Require all granted + + + AllowOverride None + Options Indexes FollowSymLinks MultiViews + Require all granted + + AddDefaultCharset UTF-8 + + + ErrorLog /var/log/apache2/error-nms-public.tg16.gathering.org.log + + # Possible values include: debug, info, notice, warn, error, crit, + # alert, emerg. + LogLevel warn + + CustomLog /var/log/apache2/access-nms-public.tg16.gathering.org.log combined + ServerSignature On + + -- cgit v1.2.3 From e3a11ccb7f67d036c1556f51efc509ee8038ca8a Mon Sep 17 00:00:00 2001 From: Kristian Lyngstol Date: Tue, 22 Mar 2016 13:18:52 +0100 Subject: NMS: Implement read/write separation in frontend --- web/etc/apache2/nms.tg16.gathering.org.conf | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'web/etc/apache2') diff --git a/web/etc/apache2/nms.tg16.gathering.org.conf b/web/etc/apache2/nms.tg16.gathering.org.conf index 1c1d7e3..08471e0 100644 --- a/web/etc/apache2/nms.tg16.gathering.org.conf +++ b/web/etc/apache2/nms.tg16.gathering.org.conf @@ -4,18 +4,29 @@ ServerAlias nms.tg16.gathering.org DocumentRoot /srv/tgmanage/web/nms.gathering.org - ScriptAlias /api/private/ /srv/tgmanage/web/nms.gathering.org/api/private/ + ScriptAlias /api/write/ /srv/tgmanage/web/nms.gathering.org/api/write/ + ScriptAlias /api/read/ /srv/tgmanage/web/nms.gathering.org/api/read/ ScriptAlias /api/public/ /srv/tgmanage/web/nms.gathering.org/api/public/ - + AllowOverride None Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - AuthUserFile /srv/tgmanage/web/.htpasswd + AuthUserFile /srv/tgmanage/web/htpasswd-write AuthName "Tech:Server Secret Volcano Lair" AuthType Basic Require valid-user + + AllowOverride None + Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch + + AuthUserFile /srv/tgmanage/web/htpasswd-read + AuthName "The Gathering Network Management System" + AuthType Basic + Require valid-user + + AllowOverride None Options +ExecCGI -MultiViews +Indexes +SymLinksIfOwnerMatch @@ -24,16 +35,13 @@ AllowOverride None Options Indexes FollowSymLinks MultiViews - AddDefaultCharset UTF-8 - - AuthUserFile /srv/tgmanage/web/.htpasswd - AuthName "Tech:Server Secret Volcano Lair" + AuthUserFile /srv/tgmanage/web/htpasswd-read + AuthName "The Gathering Network Management System" AuthType Basic Require valid-user - ErrorLog /var/log/apache2/error-nms.tg16.gathering.org.log -- cgit v1.2.3 From 8a7803625d47d375d79beb6968c1905a4f235384 Mon Sep 17 00:00:00 2001 From: Joachim Tingvold Date: Sat, 26 Mar 2016 14:45:02 +0100 Subject: Cleaning. --- web/etc/apache2/munin.tg15.gathering.org.conf | 120 ------------------------- web/etc/apache2/stats.tg15.gathering.org.conf | 21 ----- web/etc/apache2/stream.tg15.gathering.org.conf | 25 ------ 3 files changed, 166 deletions(-) delete mode 100644 web/etc/apache2/munin.tg15.gathering.org.conf delete mode 100644 web/etc/apache2/stats.tg15.gathering.org.conf delete mode 100644 web/etc/apache2/stream.tg15.gathering.org.conf (limited to 'web/etc/apache2') diff --git a/web/etc/apache2/munin.tg15.gathering.org.conf b/web/etc/apache2/munin.tg15.gathering.org.conf deleted file mode 100644 index aaa3848..0000000 --- a/web/etc/apache2/munin.tg15.gathering.org.conf +++ /dev/null @@ -1,120 +0,0 @@ - - ServerAdmin drift@gathering.org - ServerName munin.tg15.gathering.org - - # Enable this for template generation - Alias /munin /var/cache/munin/www - - # Enable this for cgi-based templates - #Alias /munin-cgi/static /var/cache/munin/www/static - #ScriptAlias /munin-cgi /usr/lib/munin/cgi/munin-cgi-html - # - # Order allow,deny - # Allow from localhost 127.0.0.0/8 ::1 - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - # - - DocumentRoot /var/cache/munin/www - - AllowOverride None - Order allow,deny - Allow from all - Options Indexes - #Require all granted - - # This file can be used as a .htaccess file, or a part of your apache - # config file. - # - # For the .htaccess file option to work the munin www directory - # (/var/cache/munin/www) must have "AllowOverride all" or something - # close to that set. - # - - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - - # This next part requires mod_expires to be enabled. - # - - # Set the default expiration time for files to 5 minutes 10 seconds from - # their creation (modification) time. There are probably new files by - # that time. - # - - SetEnvIF ^X-Forwarded-For$ "^185\.12\.59\.12$" AllowIP - SetEnvIF ^X-Forwarded-For$ "^2a02:ed02:1337::12$" AllowIP - - - AuthUserFile /root/tgmanage/web/.htpasswd - AuthName "Tech:Server Secret Volcano Lair" - AuthType Basic - Require valid-user - - Require env AllowIP - - - - ExpiresActive On - ExpiresDefault M310 - - - - - # Enables fastcgi for munin-cgi-html if present - # - # - # SetHandler fastcgi-script - # - # - - # - # SetHandler None - # - - # Enables fastcgi for munin-cgi-graph if present - ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph - - Order allow,deny - Allow from localhost 127.0.0.0/8 ::1 - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - - SetHandler fcgid-script - - - SetHandler cgi-script - - - - ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html - - Order allow,deny - Allow from localhost 127.0.0.0/8 ::1 - # AuthUserFile /etc/munin/munin-htpasswd - # AuthName "Munin" - # AuthType Basic - # require valid-user - - SetHandler fcgid-script - - - SetHandler cgi-script - - - - ErrorLog /var/log/apache2/error-munin.tg15.gathering.org.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel debug - - CustomLog /var/log/apache2/access-munin.tg15.gathering.org.log combined - ServerSignature On - diff --git a/web/etc/apache2/stats.tg15.gathering.org.conf b/web/etc/apache2/stats.tg15.gathering.org.conf deleted file mode 100644 index 2dc99a4..0000000 --- a/web/etc/apache2/stats.tg15.gathering.org.conf +++ /dev/null @@ -1,21 +0,0 @@ - - ServerAdmin drift@gathering.org - ServerName stats.tg15.gathering.org - - DocumentRoot /root/tgmanage/web/stats.gathering.org - - AllowOverride None - Options Indexes FollowSymLinks ExecCGI MultiViews - - Require all granted - - - ErrorLog /var/log/apache2/error-stats.tg15.gathering.org.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel warn - - CustomLog /var/log/apache2/access-stats.tg15.gathering.org.log combined - ServerSignature On - diff --git a/web/etc/apache2/stream.tg15.gathering.org.conf b/web/etc/apache2/stream.tg15.gathering.org.conf deleted file mode 100644 index 1f92f47..0000000 --- a/web/etc/apache2/stream.tg15.gathering.org.conf +++ /dev/null @@ -1,25 +0,0 @@ - - ServerAdmin drift@gathering.org - ServerName stream.tg15.gathering.org - ServerAlias krosus.tg15.gathering.org - - DocumentRoot /root/tgmanage/web/stream.gathering.org - - AllowOverride None - Options Indexes FollowSymLinks ExecCGI MultiViews - Order allow,deny - Allow from all - Require all granted - AddHandler cgi-script .cgi .sh .pl .py - AddDefaultCharset UTF-8 - - - ErrorLog /var/log/apache2/error-stream.tg15.gathering.org.log - - # Possible values include: debug, info, notice, warn, error, crit, - # alert, emerg. - LogLevel info - - CustomLog /var/log/apache2/access-stream.tg15.gathering.org.log combined - ServerSignature On - -- cgit v1.2.3