Admins

root@ns1:/etc# git show
commit 756f2514097e96edc7a0723c2d6844c303c6fce3
Author: Loic Dachary <loic@dachary.org>
Date:   Sun Jan 27 13:24:33 2013 +0100

    le VPN accepte maintenant 4949 pour munin

diff --git a/init.d/firewall b/init.d/firewall
index 7d0d670..a5f3a1d 100755
--- a/init.d/firewall
+++ b/init.d/firewall
@@ -533,6 +533,8 @@ fwstart() {
        ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p udp --dport 53  -j ACCEPT
         ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 80  -j ACCEPT
         ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p tcp --dport 80  -j ACCEPT
+        ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 4949  -j ACCEPT
+        ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p tcp --dport 4949  -j ACCEPT
         ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 8080  -j ACCEPT
         ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p tcp --dport 8080  -j ACCEPT
         ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 443  -j ACCEPT

root@pavot:/etc# git show
commit 09c6b67b42181ab369b8a5f1933f78fa65555f49
Author: Loic Dachary <loic@dachary.org>
Date:   Sun Jan 27 13:26:29 2013 +0100

    le VPN accepte maintenant 4949 pour munin

diff --git a/init.d/firewall.sh b/init.d/firewall.sh
index ae3047c..8748263 100755
--- a/init.d/firewall.sh
+++ b/init.d/firewall.sh
@@ -323,6 +323,8 @@ fwstart() {
         ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p udp --dport 53  -j ACCEPT
        ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 80  -j ACCEPT
         ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p tcp --dport 80  -j ACCEPT
+       ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 4949  -j ACCEPT
+        ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p tcp --dport 4949  -j ACCEPT
        ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 8080  -j ACCEPT
         ${IPT} -I OUTPUT -s $NET_VPN -d $NET_VPN -p tcp --dport 8080  -j ACCEPT
         ${IPT} -I INPUT  -s $NET_VPN -d $NET_VPN -p tcp --dport 443  -j ACCEPT

root@dns:/etc# git show
commit d228d93921ef68b0b448db0300e25cac8efc0b73
Author: Loic Dachary <loic@dachary.org>
Date:   Sun Jan 27 15:56:45 2013 +0100

    Definition de munin.vm.april-int

diff --git a/bind/zones/masters/vm.april-int b/bind/zones/masters/vm.april-int
index 4b6c61e..ca720e3 100644
--- a/bind/zones/masters/vm.april-int
+++ b/bind/zones/masters/vm.april-int
@@ -3,7 +3,7 @@ $TTL 1D

 @       IN SOA pavot.april-int. hostmaster.april.org. (

-        2013012000      ; Serial
+        2013012700      ; Serial
         3H              ; Refresh
         1H              ; Retry
         1W              ; Expire
@@ -44,5 +44,6 @@ nagios-hetzner                IN      A       192.168.4.4
 nagios                 IN      A       192.168.4.5
 gerrit                 IN      A       192.168.4.6
 spip.libre-en-fete     IN      A       192.168.4.7
+munin                  IN      A       192.168.4.8

 april-ci               IN      A       192.168.5.1

root@dns:/etc# git show
commit 5b7b4f90fd177b2d4c4a9c139552046890bb2b5f
Author: Loic Dachary <loic@dachary.org>
Date:   Sun Jan 27 16:01:38 2013 +0100

    Definition de munin.april.org

diff --git a/bind/zones/masters/april.org b/bind/zones/masters/april.org
index c4ad58d..e392289 100644
--- a/bind/zones/masters/april.org
+++ b/bind/zones/masters/april.org
@@ -2,7 +2,7 @@
 $TTL 86400      ; 1 day
 ;;
 @      IN      SOA     pavot.april.org.        hostmaster.april.org. (
-               2012122600              ; Serial  - YYYYMMDDnn
+               2013012700              ; Serial  - YYYYMMDDnn
                3600                    ; Refresh - 1 hour
                1800                    ; Retry   - 30 minutes
                604800                  ; Expire  - 7 days
@@ -25,6 +25,7 @@ ns1                   IN      A       88.191.250.4
 ;psilocybine
 psilocybine            IN      CNAME   bm0002.the.re.
 ci                     IN      A       176.31.18.26 ;; IP failover OVH
+munin                  IN      CNAME   ns1
 ;yopo
 yopo         IN  A   88.191.250.11
 drac-yopo    IN  A   88.191.250.185

root@nginx:/etc# mkdir /var/log/nginx/munin.april.org
root@nginx:/etc# chown www-data /var/log/nginx/munin.april.org
root@nginx:/etc# git show
commit bf60c9b337260aa9b874865f9f2f27978da5d927
Author: Loic Dachary <loic@dachary.org>
Date:   Sun Jan 27 16:59:45 2013 +0100
    define munin.april.org
diff --git a/nginx/sites-available/munin.april.org b/nginx/sites-available/munin.april.org
new file mode 100644
index 0000000..cd3a816
--- /dev/null
+++ b/nginx/sites-available/munin.april.org
@@ -0,0 +1,8 @@
+server {
+    listen 192.168.1.10:80;
+    server_name muni.april.org;
+    access_log /var/log/nginx/munin.april.org/access_log;
+    location / {
+        proxy_pass http://munin.vm.april-int;
+    }
+}
diff --git a/nginx/sites-enabled/munin.april.org b/nginx/sites-enabled/munin.april.org
new file mode 120000
index 0000000..45490c6
--- /dev/null
+++ b/nginx/sites-enabled/munin.april.org
@@ -0,0 +1 @@
+/etc/nginx/sites-available/munin.april.org

root@bm0001:~# nova boot --image 'puppet' --flavor e.1-cpu.10GB-disk.1GB-ram --key_name loic --availability_zone=bm0008 --poll munin
root@bm0001:~# nova list | grep munin
| d00cef97-fbd3-40f3-a69d-efae0c0983d7 | munin              | ACTIVE | novanetwork=10.145.4.15 |