Merge tmakinen/puppet

Conflicts:
	dns/manifests/init.pp

network/templates/radvd.conf.erb

@@ -0,0 +1,16 @@
+
+# <%= description %>
+interface <%= name %>
+{
+        AdvSendAdvert on;
+        MinRtrAdvInterval 3;
+        MaxRtrAdvInterval 10;
+        AdvHomeAgentFlag off;
+
+        prefix <%= prefix %>
+        {
+                AdvOnLink on;
+                AdvAutonomous on;
+                AdvRouterAddr off;
+        };
+};

network/templates/rtadvd.conf.erb

@@ -0,0 +1,4 @@
+
+# <%= description %>
+<%= name %>:\
+        :addr="<%= prefix.split("/").first %>":":prefixlen#<%= prefix.split("/").last %>:raflags#8: