Merge branch 'master' of https://github.com/al3x/sovereign

roles/ircbouncer/templates/var_lib_znc_configs_znc.conf.j2

@@ -62,7 +62,7 @@ Version = 1.0
 		LoadModule = kickrejoin
 		LoadModule = nickserv
 		LoadModule = savebuff
-		Server = chat.freenode.net 6665
+		Server = chat.freenode.net +6667
 	</Network>
 
 	Pass = {{ irc_password_hash }}

roles/vpn/tasks/openvpn.yml

@@ -93,7 +93,7 @@
            creates={{ openvpn_dhparam }}
 
 - name: Copy rc.local with firewall and dnsmasq rules into place
-  copy: src=etc_rc.local dest=/etc/rc.local
+  template: src=etc_rc.local dest=/etc/rc.local
 
 - name: Enable IPv4 traffic forwarding
   sysctl: name=net.ipv4.ip_forward value=1
@@ -104,7 +104,7 @@
     - iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
     - iptables -A FORWARD -s 10.8.0.0/24 -j ACCEPT
     - iptables -A FORWARD -j REJECT
-    - iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o eth0 -j MASQUERADE
+    - iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o {{ ansible_default_ipv4.interface }} -j MASQUERADE
 
 - name: Copy OpenVPN configuration file into place
   template: src=etc_openvpn_server.conf.j2 dest=/etc/openvpn/server.conf

roles/vpn/files/etc_rc.local → roles/vpn/templates/etc_rc.local

@@ -13,7 +13,7 @@
 iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
 iptables -A FORWARD -s 10.8.0.0/24 -j ACCEPT
 iptables -A FORWARD -j REJECT
-iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o eth0 -j MASQUERADE
+iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o {{ ansible_default_ipv4.interface }} -j MASQUERADE
 
 /etc/init.d/dnsmasq restart