move to tags #80

deploy.yml

@@ -20,11 +20,11 @@
   pre_tasks:  
     - name: Common pre-tasks
       include: playbooks/common.yml
-      tags: [ 'digitalocean', 'ec2', 'gce' ]
+      tags: [ 'digitalocean', 'ec2', 'gce', 'pre' ]
       
     - name: DigitalOcean pre-tasks
       include: playbooks/digitalocean.yml
-      tags: [ 'digitalocean', 'ec2', 'gce' ]
+      tags: [ 'digitalocean' ]
 
   roles:
     - { role: security, tags: [ 'security' ] }
@@ -32,10 +32,9 @@
     - { role: dns_adblocking, tags: ['dns', 'adblock' ] }
     - { role: logging, tags: [ 'logging' ] }
     - { role: ssh_tunneling, tags: [ 'ssh_tunneling' ] }
-    - { role: vpn, tags: [ 'vpn' ] }    
+    - { role: vpn, tags: [ 'vpn' ] }   
-   
 
   handlers:
     - name: reload eth0
       shell: sh -c 'ifdown eth0; ip addr flush dev eth0; ifup eth0'
-  
+  

roles/vpn/meta/main.yml

@@ -1,4 +1,5 @@
 ---
 
 dependencies:
-  - { role: common }
+  - { role: common }
+