Merge remote-tracking branch 'origin/fix-pull-errors'

hashbang · Dec 30, 2018 · 6ffdde7 · 6ffdde7
2 parents 9f937b7 + 5c1ab4a
commit 6ffdde7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ansible/tasks/dns/main.yml b/ansible/tasks/dns/main.yml
@@ -88,5 +88,16 @@
 
   with_items:
     - unbound
+
+# TODO This is a hotfix, try and merge with above if possible
+- name: Enable & restat services
+  when: not dockerenv.stat.exists
+  systemd:
+    name: "{{ item }}"
+    enabled: yes
+    masked: no
+    state: restarted  # TODO: This should be a handler instead
+
+  with_items:
     - unbound-resolvconf
     - resolvconf
diff --git a/ansible/tasks/hashbang/main.yml b/ansible/tasks/hashbang/main.yml
@@ -17,7 +17,7 @@
           gpg --keyserver "$server" --recv-keys "{{ item }}" && break || : ; \
         done
         sshkey=$(gpg --export-ssh-key {{ item }})
-        if ! grep -q $sshkey /root/.ssh/authorized_keys; then
+        if ! grep -q "$sshkey" /root/.ssh/authorized_keys; then
           echo $sshkey | tee -a /root/.ssh/authorized_keys
         fi
       args: