linting

README.md

@@ -7,11 +7,12 @@ Algo (short for "Al Gore", the **V**ice **P**resident of **N**etworks everywhere
 ## Features
 
 * Supports only IKEv2
-* Supports only AES GCM, SHA2 HMAC, and P-256 DH
+* Supports only a single cipher suite w/ AES GCM, SHA2 HMAC, and P-256 DH
 * Generates mobileconfig profiles to auto-configure Apple devices
 * Provides helper scripts to add and remove users
 * Blocks ads with a local DNS resolver and HTTP proxy (optional)
 * Based on current versions of Ubuntu and StrongSwan
+* Installs to DigitalOcean, Amazon EC2, Google Cloud Engine, or your own server
 
 ## Anti-features
 
@@ -46,12 +47,6 @@ sudo easy_install pip
 sudo pip install ansible dopy==0.3.5 boto apache-libcloud six
 ```
 
-There are four available installation targets:  
-* DigitalOcean
-* Amazon EC2
-* Google Cloud Engine
-* Local servers
-
 Open the file `config.cfg` in your favorite text editor. Specify the users you wish to create in the `users` list.
 
 Start the deploy and follow the instructions:

azure.yml

@@ -93,7 +93,3 @@
     - vpn
     - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' }
 
-    
-
-
-

digitalocean.yml

@@ -120,7 +120,3 @@
   handlers:
     - name: reload eth0
       shell: sh -c 'ifdown eth0; ip addr flush dev eth0; ifup eth0'
-    
-
-
-

ec2.yml

@@ -88,4 +88,3 @@
     - features
     - vpn
     - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' }
-

google_cloud.yml

@@ -84,8 +84,3 @@
     - features
     - vpn
     - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' }
-     
-    
-
-
-

non-cloud.yml

@@ -56,4 +56,3 @@
     - features
     - vpn
     - { role: logging, when: auditd_enabled is defined and auditd_enabled == 'Y' }
-

roles/common/handlers/main.yml

@@ -6,4 +6,3 @@
 
 - name: flush routing cache
   shell: echo 1 > /proc/sys/net/ipv4/route/flush
-  

roles/common/tasks/main.yml

@@ -64,7 +64,7 @@
     - iptables-persistent
 
 - name: Configure unattended-upgrades
-  template: src=50unattended-upgrades.j2 dest=/etc/apt/apt.conf.d/50unattended-upgrades owner=root group=root mode=644
+  template: src=50unattended-upgrades.j2 dest=/etc/apt/apt.conf.d/50unattended-upgrades owner=root group=root mode=0644
 
 - name: Periodic upgrades configured
-  template: src=10periodic.j2 dest=/etc/apt/apt.conf.d/10periodic owner=root group=root mode=644
+  template: src=10periodic.j2 dest=/etc/apt/apt.conf.d/10periodic owner=root group=root mode=0644

roles/digitalocean/tasks/main.yml

@@ -36,4 +36,3 @@
 
 - name: Wait for SSH to become available
   local_action: "wait_for port=22 host={{ do.droplet.ip_address }} timeout=320"
-

roles/ec2/tasks/main.yml

@@ -77,4 +77,3 @@
   local_action: "wait_for port=22 host={{ item.public_dns_name }} timeout=320"
   with_items: "{{ ec2.instances }}"
   become: false
-  

roles/features/tasks/main.yml

@@ -24,7 +24,7 @@
     - restart privoxy
 
 - name: Privoxy profile for apparmor configured
-  template: src=usr.sbin.privoxy.j2 dest=/etc/apparmor.d/usr.sbin.privoxy owner=root group=root mode=600
+  template: src=usr.sbin.privoxy.j2 dest=/etc/apparmor.d/usr.sbin.privoxy owner=root group=root mode=0600
   notify:
   - restart privoxy
 
@@ -80,7 +80,7 @@
   apt: name=dnsmasq state=latest
 
 - name: Dnsmasq profile for apparmor configured
-  template: src=usr.sbin.dnsmasq.j2 dest=/etc/apparmor.d/usr.sbin.dnsmasq owner=root group=root mode=600
+  template: src=usr.sbin.dnsmasq.j2 dest=/etc/apparmor.d/usr.sbin.dnsmasq owner=root group=root mode=0600
   notify:
   - restart dnsmasq
 
@@ -93,7 +93,7 @@
   - restart dnsmasq
 
 - name: Adblock script created
-  template: src=adblock.sh dest=/opt/adblock.sh owner=root group=root mode=755
+  template: src=adblock.sh dest=/opt/adblock.sh owner=root group=root mode=0755
   when: dns_enabled is defined and dns_enabled == "Y"
 
 - name: Adblock script added to cron

roles/google_cloud/tasks/main.yml

@@ -31,13 +31,9 @@
     allowed: "udp:500,4500;tcp:22"
     state: "present"
     src_range: 0.0.0.0/0
-    service_account_email: "{{ credentials_file_lookup.client_email  }}"
+    service_account_email: "{{ credentials_file_lookup.client_email }}"
     credentials_file: "{{ credentials_file  }}"
-    project_id: "{{ credentials_file_lookup.project_id  }}"
+    project_id: "{{ credentials_file_lookup.project_id }}"
 
 - name: Wait for SSH to become available
   local_action: "wait_for port=22 host={{ google_vm.instance_data[0].public_ip }} timeout=320"
-  
-  
-   
-

roles/logging/tasks/main.yml

@@ -13,4 +13,3 @@
 
 - name: Enable services
   service: name=auditd enabled=yes
- 

roles/vpn/tasks/main.yml

@@ -28,17 +28,17 @@
   - save iptables
 
 - name: Setup the ipsec.conf file from our template
-  template: src=ipsec.conf.j2 dest=/etc/ipsec.conf owner=root group=root mode=644
+  template: src=ipsec.conf.j2 dest=/etc/ipsec.conf owner=root group=root mode=0644
   notify:
   - restart strongswan
 
 - name: Setup the ipsec.secrets file
-  template: src=ipsec.secrets.j2 dest=/etc/ipsec.secrets owner=root group=root mode=600
+  template: src=ipsec.secrets.j2 dest=/etc/ipsec.secrets owner=root group=root mode=0600
   notify:
   - restart strongswan
 
 - name: Fetch easy-rsa-ipsec from git
-  git: repo=git://github.com/ValdikSS/easy-rsa-ipsec.git dest="{{ easyrsa_dir }}"
+  git: repo=git://github.com/ValdikSS/easy-rsa-ipsec.git version=ed4de10d7ce0726357fb1bb4729f8eb440c06e2b dest="{{ easyrsa_dir }}"
 
 - name: Setup the vars file from our template
   template: src=easy-rsa.vars.j2 dest={{ easyrsa_dir }}/easyrsa3/vars

users.yml

@@ -98,4 +98,3 @@
     
   - name: Fetch server CA certificate
     fetch: src=/{{ easyrsa_dir }}/easyrsa3/pki/ca.crt dest=configs/{{ server_name }}_ca.crt flat=yes
-