소스 검색

Merge branch 'openvpn-bug-fixes' of github.com:alexec/sovereign

Thomas Buck 5 년 전
부모
커밋
4d674b5f9a
2개의 변경된 파일5개의 추가작업 그리고 4개의 파일을 삭제
  1. 3
    2
      roles/vpn/tasks/openvpn.yml
  2. 2
    2
      roles/vpn/templates/etc_openvpn_server.conf.j2

+ 3
- 2
roles/vpn/tasks/openvpn.yml 파일 보기

168
 
168
 
169
 - name: Retrieve the files that clients will need in order to connect to the OpenVPN server
169
 - name: Retrieve the files that clients will need in order to connect to the OpenVPN server
170
   fetch: src={{ openvpn_path }}/{{ item[0] }}/{{ item[1] }}
170
   fetch: src={{ openvpn_path }}/{{ item[0] }}/{{ item[1] }}
171
-         dest=/tmp/sovereign-openvpn-files
171
+         dest=/tmp/sovereign-openvpn-files fail_on_missing=yes
172
   with_nested:
172
   with_nested:
173
     - "{{ openvpn_clients }}"
173
     - "{{ openvpn_clients }}"
174
     - ["client.crt", "client.key", "ca.crt", "ta.key", "{{ openvpn_server }}.ovpn"]
174
     - ["client.crt", "client.key", "ca.crt", "ta.key", "{{ openvpn_server }}.ovpn"]
175
 
175
 
176
-- pause: seconds=5
176
+- name: Pause 5s seconds for OpenVPN ready
177
+  pause: seconds=5
177
          prompt="You are ready to set up your OpenVPN clients. The files that you need are in /tmp/sovereign-openvpn-files. Make sure LZO compression is enabled and that you provide the ta.key file for the TLS-Auth option with a direction of '1'. Press any key to continue..."
178
          prompt="You are ready to set up your OpenVPN clients. The files that you need are in /tmp/sovereign-openvpn-files. Make sure LZO compression is enabled and that you provide the ta.key file for the TLS-Auth option with a direction of '1'. Press any key to continue..."

+ 2
- 2
roles/vpn/templates/etc_openvpn_server.conf.j2 파일 보기

187
 # (The OpenVPN server machine may need to NAT
187
 # (The OpenVPN server machine may need to NAT
188
 # or bridge the TUN/TAP interface to the internet
188
 # or bridge the TUN/TAP interface to the internet
189
 # in order for this to work properly).
189
 # in order for this to work properly).
190
-push "redirect-gateway def1"
190
+push "redirect-gateway def1 bypass-dhcp"
191
 push "dhcp-option DNS 10.8.0.1"
191
 push "dhcp-option DNS 10.8.0.1"
192
 
192
 
193
 # Certain Windows-specific network settings
193
 # Certain Windows-specific network settings
278
 # Output a short status file showing
278
 # Output a short status file showing
279
 # current connections, truncated
279
 # current connections, truncated
280
 # and rewritten every minute.
280
 # and rewritten every minute.
281
-status openvpn-status.log
281
+;status openvpn-status.log
282
 
282
 
283
 # By default, log messages will go to the syslog (or
283
 # By default, log messages will go to the syslog (or
284
 # on Windows, if running as a service, they will go to
284
 # on Windows, if running as a service, they will go to

Loading…
취소
저장