Merge branch 'devel' into 'test'

Restrict mysql (33060) to liu-nets

See merge request !40

templates/55-permit-skadereg.rules.erb

@@ -3,10 +3,11 @@ require services
 policy skadereg chain skadereg is
 	accept service:http
 	accept service:https
-	accept { tcp/33060 }
 end policy
 
 append rule INPUT -j skadereg
+append rule INPUT -s class:liu-nets -p tcp --dport 33060:33060 -j ACCEPT
+
 
 # <%# Put installed file in view mode when opened with Emacs: -%>
 # <%= "Nota bene: Puppet managed file, all local changes will be reverted." %>