aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xclients/update-public-nms.sh9
-rw-r--r--web/etc/apache2/nms-public.tg15.gathering.org11
-rw-r--r--web/etc/apache2/nms.tg15.gathering.org36
3 files changed, 53 insertions, 3 deletions
diff --git a/clients/update-public-nms.sh b/clients/update-public-nms.sh
index fe384cb..8d56251 100755
--- a/clients/update-public-nms.sh
+++ b/clients/update-public-nms.sh
@@ -1,9 +1,12 @@
#!/bin/sh
+YEAR=15
TGMANAGE=/root/tgmanage
-DIR=$TGMANAGE/web/nms-public.gathering.org
+DIR=/srv/www/nms-public.tg${YEAR}.gathering.org
+set -x
+mkdir -p $DIR
-wget -qO$DIR/nettkart-dhcp.png.new http://nms.tg14.gathering.org/dhcpkart.pl
-wget -qO$DIR/led.txt.new http://nms.tg14.gathering.org/led.pl
+wget -qO$DIR/nettkart-dhcp.png.new http://nms.tg${YEAR}.gathering.org/dhcpkart.pl
+wget -qO$DIR/led.txt.new http://nms.tg${YEAR}.gathering.org/led.pl
mv $DIR/nettkart-dhcp.png.new $DIR/nettkart-dhcp.png
mv $DIR/led.txt.new $DIR/led.txt
/usr/bin/perl $TGMANAGE/clients/update-public-speedometer.pl > $DIR/speedometer.json.tmp
diff --git a/web/etc/apache2/nms-public.tg15.gathering.org b/web/etc/apache2/nms-public.tg15.gathering.org
new file mode 100644
index 0000000..4ebf79b
--- /dev/null
+++ b/web/etc/apache2/nms-public.tg15.gathering.org
@@ -0,0 +1,11 @@
+<VirtualHost *:80>
+ ServerAdmin drift@gathering.org
+ ServerName nms-public.tg15.gathering.org
+
+ DocumentRoot /srv/www/nms-public.tg15.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
+</VirtualHost>
diff --git a/web/etc/apache2/nms.tg15.gathering.org b/web/etc/apache2/nms.tg15.gathering.org
new file mode 100644
index 0000000..b06257d
--- /dev/null
+++ b/web/etc/apache2/nms.tg15.gathering.org
@@ -0,0 +1,36 @@
+<VirtualHost *:80>
+ ServerAdmin drift@gathering.org
+ ServerName nms.tg15.gathering.org
+ ServerAlias noget.tg15.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 192.168.122.0/24
+
+ 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.tg15.gathering.org.log
+
+ # Possible values include: debug, info, notice, warn, error, crit,
+ # alert, emerg.
+ LogLevel warn
+
+ CustomLog /var/log/apache2/access-nms.tg15.gathering.org.log combined
+ ServerSignature On
+
+</VirtualHost>