Remove ferm dependency and put rules in envvar. See debops/debops-pla…

…ybooks#192 for details
jstruebel · Sep 10, 2016 · 88f83d5 · 88f83d5
1 parent 69d55b8
commit 88f83d5
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -246,3 +246,29 @@ samba__default_shares:
     guest_ok: 'yes'
 
 # .. )))
+
+# .. envvar:: samba__ferm__dependent_rules: (((
+#
+# Configuration for :command:`iptables` firewall managed by :program:`ferm`.
+samba__ferm__dependent_rules:
+
+  - type: 'dport_accept'
+    protocol: [ 'udp' ]
+    dport: [ 'netbios-ns', 'netbios-dgm' ]
+    saddr: '{{ samba__allow }}'
+    accept_any: True
+    filename: 'samba__dependency_accept_udp'
+    delete: '{{ "samba" not in samba__base_packages }}'
+    weight: '50'
+
+  - type: 'dport_accept'
+    protocol: [ 'tcp' ]
+    dport: [ 'netbios-ssn', 'microsoft-ds' ]
+    saddr: '{{ samba__allow }}'
+    accept_any: True
+    filename: 'samba__dependency_accept_tcp'
+    delete: '{{ "samba" not in samba__base_packages }}'
+    weight: '50'
+
+
+# .. )))
diff --git a/meta/main.yml b/meta/main.yml
@@ -1,30 +1,5 @@
 ---
 
-dependencies:
-
-  - role: debops.ferm
-    tags: [ 'depend::ferm', 'depend::ferm:samba',
-            'depend-of::samba', 'type::dependency' ]
-    ferm_input_list:
-
-      - type: 'dport_accept'
-        protocol: [ 'udp' ]
-        dport: [ 'netbios-ns', 'netbios-dgm' ]
-        saddr: '{{ samba__allow }}'
-        accept_any: True
-        filename: 'samba__dependency_accept_udp'
-        delete: '{{ "samba" not in samba__base_packages }}'
-        weight: '50'
-
-      - type: 'dport_accept'
-        protocol: [ 'tcp' ]
-        dport: [ 'netbios-ssn', 'microsoft-ds' ]
-        saddr: '{{ samba__allow }}'
-        accept_any: True
-        filename: 'samba__dependency_accept_tcp'
-        delete: '{{ "samba" not in samba__base_packages }}'
-        weight: '50'
-
 galaxy_info:
 
   company: 'DebOps'