PajamaSoft пре 11 година
родитељ
комит
a7159f63a2

+ 1
- 1
roles/ircbouncer/templates/var_lib_znc_configs_znc.conf.j2 Прегледај датотеку

62
 		LoadModule = kickrejoin
62
 		LoadModule = kickrejoin
63
 		LoadModule = nickserv
63
 		LoadModule = nickserv
64
 		LoadModule = savebuff
64
 		LoadModule = savebuff
65
-		Server = chat.freenode.net 6665
65
+		Server = chat.freenode.net +6667
66
 	</Network>
66
 	</Network>
67
 
67
 
68
 	Pass = {{ irc_password_hash }}
68
 	Pass = {{ irc_password_hash }}

+ 2
- 2
roles/vpn/tasks/openvpn.yml Прегледај датотеку

93
            creates={{ openvpn_dhparam }}
93
            creates={{ openvpn_dhparam }}
94
 
94
 
95
 - name: Copy rc.local with firewall and dnsmasq rules into place
95
 - name: Copy rc.local with firewall and dnsmasq rules into place
96
-  copy: src=etc_rc.local dest=/etc/rc.local
96
+  template: src=etc_rc.local dest=/etc/rc.local
97
 
97
 
98
 - name: Enable IPv4 traffic forwarding
98
 - name: Enable IPv4 traffic forwarding
99
   sysctl: name=net.ipv4.ip_forward value=1
99
   sysctl: name=net.ipv4.ip_forward value=1
104
     - iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
104
     - iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
105
     - iptables -A FORWARD -s 10.8.0.0/24 -j ACCEPT
105
     - iptables -A FORWARD -s 10.8.0.0/24 -j ACCEPT
106
     - iptables -A FORWARD -j REJECT
106
     - iptables -A FORWARD -j REJECT
107
-    - iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o eth0 -j MASQUERADE
107
+    - iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o {{ ansible_default_ipv4.interface }} -j MASQUERADE
108
 
108
 
109
 - name: Copy OpenVPN configuration file into place
109
 - name: Copy OpenVPN configuration file into place
110
   template: src=etc_openvpn_server.conf.j2 dest=/etc/openvpn/server.conf
110
   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
 iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
13
 iptables -A FORWARD -m state --state RELATED,ESTABLISHED -j ACCEPT
14
 iptables -A FORWARD -s 10.8.0.0/24 -j ACCEPT
14
 iptables -A FORWARD -s 10.8.0.0/24 -j ACCEPT
15
 iptables -A FORWARD -j REJECT
15
 iptables -A FORWARD -j REJECT
16
-iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o eth0 -j MASQUERADE
16
+iptables -t nat -A POSTROUTING -s 10.8.0.0/24 -o {{ ansible_default_ipv4.interface }} -j MASQUERADE
17
 
17
 
18
 /etc/init.d/dnsmasq restart
18
 /etc/init.d/dnsmasq restart
19
 
19
 

Loading…
Откажи
Сачувај