aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--web/etc/apache2/nms-public.tg13.gathering.org11
-rw-r--r--web/etc/apache2/nms.tg13.gathering.org39
-rw-r--r--web/etc/apache2/nms.tg15.gathering.org7
3 files changed, 3 insertions, 54 deletions
diff --git a/web/etc/apache2/nms-public.tg13.gathering.org b/web/etc/apache2/nms-public.tg13.gathering.org
deleted file mode 100644
index 2c6115a..0000000
--- a/web/etc/apache2/nms-public.tg13.gathering.org
+++ /dev/null
@@ -1,11 +0,0 @@
-<VirtualHost *:80>
- ServerAdmin drift@gathering.org
- ServerName nms-public.tg13.gathering.org
-
- DocumentRoot /srv/www/nms-public.tg13.gathering.org
- AddHandler cgi-script .cgi .sh .pl .py
-
- LogLevel warn
- ErrorLog /var/log/apache2/error-nms-public.tg13.gathering.org.log
- CustomLog /var/log/apache2/access-nms-public.tg13.gathering.org.log combined
-</VirtualHost>
diff --git a/web/etc/apache2/nms.tg13.gathering.org b/web/etc/apache2/nms.tg13.gathering.org
deleted file mode 100644
index cb81598..0000000
--- a/web/etc/apache2/nms.tg13.gathering.org
+++ /dev/null
@@ -1,39 +0,0 @@
-<VirtualHost *:80>
- ServerAdmin drift@gathering.org
- ServerName nms.tg13.gathering.org
- ServerAlias flexus.tg13.gathering.org
-
- DocumentRoot /root/tgmanage/web/nms.gathering.org
- <Directory "/root/tgmanage/web/nms.gathering.org">
- AllowOverride None
- Options Indexes FollowSymLinks ExecCGI MultiViews
- Order allow,deny
- Satisfy any
- Allow from ::1
- Allow from 127.0.0.1
- Allow from 151.216.125.0/24
- Allow from 151.216.124.0/24
- Allow from 2a02:ed02:124::/64
- Allow from 2a02:ed02:125::/64
-
- AddHandler cgi-script .cgi .sh .pl .py
- AddDefaultCharset UTF-8
-
- AuthUserFile /root/tgmanage/web/.htpasswd
- AuthGroupFile /dev/null
- AuthName "Tech:Server Secret Volcano Lair"
- AuthType Basic
-
- require valid-user
- </Directory>
-
- ErrorLog /var/log/apache2/error-nms.tg13.gathering.org.log
-
- # Possible values include: debug, info, notice, warn, error, crit,
- # alert, emerg.
- LogLevel warn
-
- CustomLog /var/log/apache2/access-nms.tg13.gathering.org.log combined
- ServerSignature On
-
-</VirtualHost>
diff --git a/web/etc/apache2/nms.tg15.gathering.org b/web/etc/apache2/nms.tg15.gathering.org
index b06257d..fc0cee4 100644
--- a/web/etc/apache2/nms.tg15.gathering.org
+++ b/web/etc/apache2/nms.tg15.gathering.org
@@ -1,7 +1,7 @@
<VirtualHost *:80>
ServerAdmin drift@gathering.org
ServerName nms.tg15.gathering.org
- ServerAlias noget.tg15.gathering.org
+ ServerAlias einstein.tg15.gathering.org
DocumentRoot /root/tgmanage/web/nms.gathering.org
<Directory "/root/tgmanage/web/nms.gathering.org">
@@ -11,16 +11,15 @@
Satisfy any
Allow from ::1
Allow from 127.0.0.1
- Allow from 192.168.122.0/24
+ Allow from 151.216.254.201/24
+ Allow from 2a02:ed02:254::0/64
AddHandler cgi-script .cgi .sh .pl .py
AddDefaultCharset UTF-8
AuthUserFile /root/tgmanage/web/.htpasswd
- AuthGroupFile /dev/null
AuthName "Tech:Server Secret Volcano Lair"
AuthType Basic
-
require valid-user
</Directory>