diff options
author | Joachim Tingvold <joachim@tingvold.com> | 2015-04-01 03:53:17 +0200 |
---|---|---|
committer | root <root@einstein.tg15.gathering.org> | 2015-04-01 03:53:17 +0200 |
commit | a358e2b9b0d76515696276dbac80889e8ccd1e79 (patch) | |
tree | 685de8143f07de6a15eac6d1f0131abbe9bc8f15 | |
parent | cfa430c07029868bdfd65714fd4974892467b4f4 (diff) |
Stuff...
-rw-r--r-- | patchlist_extras.txt | 3 | ||||
-rw-r--r-- | switches_extras.txt | 3 | ||||
-rwxr-xr-x | tools/make_dummy_placement.sh | 9 | ||||
-rw-r--r-- | web/etc/apache2/munin.tg15.gathering.org | 114 |
4 files changed, 129 insertions, 0 deletions
diff --git a/patchlist_extras.txt b/patchlist_extras.txt new file mode 100644 index 0000000..745133a --- /dev/null +++ b/patchlist_extras.txt @@ -0,0 +1,3 @@ +sw1-infodesk rs1.north ge-0/0/12 +sw2-gamestudio rs1.north ge-0/0/45 +sw3-streamerlounge rs1.north ge-0/0/16 diff --git a/switches_extras.txt b/switches_extras.txt new file mode 100644 index 0000000..098fc9d --- /dev/null +++ b/switches_extras.txt @@ -0,0 +1,3 @@ +sw1-infodesk 151.216.130.0/24 2a02:ed02:230::/64 151.216.183.229/27 2a02:ed02:1837::229/64 230 rs1.north +sw2-gamestudio 151.216.229.0/24 2a02:ed02:229::/64 151.216.183.230/27 2a02:ed02:1837::230/64 229 rs1.north +sw3-streamerlounge 151.216.229.0/24 2a02:ed02:229::/64 151.216.183.231/27 2a02:ed02:1837::231/64 229 rs1.north diff --git a/tools/make_dummy_placement.sh b/tools/make_dummy_placement.sh new file mode 100755 index 0000000..7f93be9 --- /dev/null +++ b/tools/make_dummy_placement.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +for a in $* ; do +X=$(( $RANDOM % 500 )) +Y=$(( $RANDOM % 500 )) +X1=$(( $X + 150 )) +Y1=$(( $Y + 20 )) +echo "insert into placements select switch, box '(($X,$Y),($X1,$Y1))' from switches where sysname = '$a';" +done diff --git a/web/etc/apache2/munin.tg15.gathering.org b/web/etc/apache2/munin.tg15.gathering.org new file mode 100644 index 0000000..3e8eca4 --- /dev/null +++ b/web/etc/apache2/munin.tg15.gathering.org @@ -0,0 +1,114 @@ +<VirtualHost *:8080> + ServerAdmin drift@gathering.org + ServerName munin.tg15.gathering.org + ServerAlias 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 + #<Location /munin-cgi> + # Order allow,deny + # Allow from localhost 127.0.0.0/8 ::1 + # AuthUserFile /etc/munin/munin-htpasswd + # AuthName "Munin" + # AuthType Basic + # require valid-user + #</Location> + + DocumentRoot /var/cache/munin/www + <Directory /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. + # + + AuthUserFile /root/tgmanage/web/.htpasswd + AuthName "Tech:Server Secret Volcano Lair" + AuthType Basic + require valid-user + + <IfModule mod_expires.c> + ExpiresActive On + ExpiresDefault M310 + </IfModule> + + </Directory> + + # Enables fastcgi for munin-cgi-html if present + #<Location /munin-cgi> + # <IfModule mod_fastcgi.c> + # SetHandler fastcgi-script + # </IfModule> + #</Location> + + #<Location /munin-cgi/static> + # SetHandler None + #</Location> + + # Enables fastcgi for munin-cgi-graph if present + ScriptAlias /munin-cgi/munin-cgi-graph /usr/lib/munin/cgi/munin-cgi-graph + <Location /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 + <IfModule mod_fcgid.c> + SetHandler fcgid-script + </IfModule> + <IfModule !mod_fcgid.c> + SetHandler cgi-script + </IfModule> + </Location> + + ScriptAlias /munin-cgi/munin-cgi-html /usr/lib/munin/cgi/munin-cgi-html + <Location /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 + <IfModule mod_fcgid.c> + SetHandler fcgid-script + </IfModule> + <IfModule !mod_fcgid.c> + SetHandler cgi-script + </IfModule> + </Location> + + 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 +</VirtualHost> |