Browse Source

removed part of iptables command for compatibility

panda 4 years ago
parent
commit
e6014d1355
2 changed files with 16 additions and 6 deletions
  1. 9 6
      common.yml
  2. 7 0
      roles/tor/tasks/debian_family.yml

+ 9 - 6
common.yml

@@ -7,13 +7,16 @@
     - variables.yml
 
   tasks:
-    - fail: msg="The user in the list 'users' in variables.yml, has to be set to somethings else than CHANGEME"
+    - name: "check the variable: users"
+      fail: msg="The user in the list 'users' in variables.yml, has to be set to somethings else than CHANGEME"
       when: '"CHANGEME" in users'
 
-    - fail: msg="The variable 'hostname' in variables.yml, has to be set to somethings else than CHANGEME"
+    - name: "check the variable: hostname"
+      fail: msg="The variable 'hostname' in variables.yml, has to be set to somethings else than CHANGEME"
       when: '"CHANGEME" in hostname'
 
-    - fail: msg="The variable 'tinc_vpn' in variables.yml, has to be set to somethings else than CHANGEME"
+    - name: "check the variable: tinc_vpn"
+      fail: msg="The variable 'tinc_vpn' in variables.yml, has to be set to somethings else than CHANGEME"
       when: '"CHANGEME" in tinc_vpn'
 
 ###
@@ -32,7 +35,7 @@
 
     - name: Set timezone to {{ timezone }}
       timezone:
-        name: {{ timezone }}
+        name: "{{ timezone }}"
 
     - name: Update repositories cache
       apt:
@@ -115,10 +118,10 @@
           # Completed on Tue Nov 19 22:58:08 2019
 
     - name: reload iptables v4
-      action: shell /sbin/iptables-restore -! < /scripts/rules.v4
+      action: shell /sbin/iptables-restore /scripts/rules.v4
 
     - name: reload iptables v4
-      action: shell /sbin/ip6tables-restore -! < /scripts/rules.v6
+      action: shell /sbin/ip6tables-restore /scripts/rules.v6
 
     - name: save iptables v4 rules
       shell: iptables-save > /etc/iptables/rules.v4

+ 7 - 0
roles/tor/tasks/debian_family.yml

@@ -16,6 +16,13 @@
 - name: Add tor repo key
   shell: curl https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc | gpg --import
 
+- name: Add key to apt
+  shell: gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
+
+- name: Update repositories cache
+  apt:
+    update_cache: yes
+
 - name: Install tor
   apt:
     pkg: