diff --git a/deploy_env/group_vars/all.yml b/deploy_env/group_vars/all.yml index a59e087..8820e24 100644 --- a/deploy_env/group_vars/all.yml +++ b/deploy_env/group_vars/all.yml @@ -52,7 +52,7 @@ wannat_global: rpm_files: wannat_common_rpm_file: "libwannat_common-1.0.1.8cc3bda-2.el7.x86_64.rpm" - natgw_rpm_file: "wannat_natgw-1.5.1.3d915d4-2.el7.x86_64.rpm" + natgw_rpm_file: "wannat_natgw-1.5.2.e1a3747-2.el7.x86_64.rpm" wire_graft_rpm_file: "libwire_graft-1.5.2.36b072a-2.el7.x86_64.rpm" toroad_rpm_file: "toroad-1.4.2.483a553-2.el7.x86_64.rpm" ppp_rpm_file: "ppp-2.4.5-34.el7_7.x86_64.rpm" diff --git a/roles/natgw/files/rpm/wannat_natgw-1.5.1.3d915d4-2.el7.x86_64.rpm b/roles/natgw/files/rpm/wannat_natgw-1.5.1.3d915d4-2.el7.x86_64.rpm deleted file mode 100644 index 5b0b982..0000000 Binary files a/roles/natgw/files/rpm/wannat_natgw-1.5.1.3d915d4-2.el7.x86_64.rpm and /dev/null differ diff --git a/roles/natgw/files/rpm/wannat_natgw-1.5.2.e1a3747-2.el7.x86_64.rpm b/roles/natgw/files/rpm/wannat_natgw-1.5.2.e1a3747-2.el7.x86_64.rpm new file mode 100644 index 0000000..fb5d6a1 Binary files /dev/null and b/roles/natgw/files/rpm/wannat_natgw-1.5.2.e1a3747-2.el7.x86_64.rpm differ diff --git a/roles/natgw/templates/natgw.conf.j2 b/roles/natgw/templates/natgw.conf.j2 index 47e711f..028796d 100644 --- a/roles/natgw/templates/natgw.conf.j2 +++ b/roles/natgw/templates/natgw.conf.j2 @@ -49,5 +49,5 @@ Maat_redis_index={{wannat_global.common.redis_index}} port=8000 l3_sysemd_service_name=pptpd url_path=/v1/wannat/access_servers - +server_accessory="openvpn_client_tools.zip" diff --git a/roles/openvpn/client_tools/openvpn-install-2.4.11-I602-Win10.exe b/roles/openvpn/client_tools/openvpn-install-2.4.11-I602-Win10.exe deleted file mode 100644 index 7d2a6ea..0000000 Binary files a/roles/openvpn/client_tools/openvpn-install-2.4.11-I602-Win10.exe and /dev/null differ diff --git a/roles/openvpn/client_tools/openvpn-install-2.4.11-I602-Win7_Win8.exe b/roles/openvpn/client_tools/openvpn-install-2.4.11-I602-Win7_Win8.exe deleted file mode 100644 index 2b60203..0000000 Binary files a/roles/openvpn/client_tools/openvpn-install-2.4.11-I602-Win7_Win8.exe and /dev/null differ diff --git a/roles/openvpn/client_tools/openvpn_client_example.ovpn b/roles/openvpn/client_tools/openvpn_client_example.ovpn deleted file mode 100644 index 682487a..0000000 --- a/roles/openvpn/client_tools/openvpn_client_example.ovpn +++ /dev/null @@ -1,36 +0,0 @@ -client -dev tun -proto tcp -;;;change remote server ipaddress or port for your environment -remote 192.168.1.1 1194 -resolv-retry infinite -nobind -persist-key -persist-tun -remote-cert-tls server -compress lz4-v2 -verb 3 -auth-user-pass - - ------BEGIN CERTIFICATE----- -MIIDNTCCAh2gAwIBAgIJAKc5EuH/0f7oMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNV -BAMMC0Vhc3ktUlNBIENBMB4XDTIxMDUyNDA5MzE0MFoXDTMxMDUyMjA5MzE0MFow -FjEUMBIGA1UEAwwLRWFzeS1SU0EgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQCrJSQpFiTSiKb1ViGJ4DVFpdE8TNvA1GGJHaSZG6PH4aU57TX4ebSW -YmvOMitGBr8RcjV2FQkhsDzgLpb5Eaoz/ZPXNvFiLCclfxLwzIa/UcnnVcvIYDZp -sHhBR1xcuwyYQ9x9phlF3NOjEq9wIhl8zbzvJoVNEWn1eeFp6EwPpLJGeOJllqd5 -SIQYhu/uWHsgSOizgGlJl+CphLleacsaTWiPoynhY8sewFdwk+MOVsG+K+QigXfM -CawKlu/23pKteBC+lVZAoncsaCns2YvCm830I5vfbX7aMKa97UKFUNcPq5OFkRD1 -IzQVan7vuwjkGJWMZh63P5HUlxIEREIHAgMBAAGjgYUwgYIwHQYDVR0OBBYEFJZD -HSezPvx6TIroZIaNknuFwMC4MEYGA1UdIwQ/MD2AFJZDHSezPvx6TIroZIaNknuF -wMC4oRqkGDAWMRQwEgYDVQQDDAtFYXN5LVJTQSBDQYIJAKc5EuH/0f7oMAwGA1Ud -EwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUAA4IBAQCBlv31E16y -xr3zI43F89hmo1UkBPZxKzP4bFe3CSAiv9nZbungHm13l+hJybQ9XQWstf1I+HZL -SH9Ub1ygdf4+rfS5Lm1rusgCDWWdwRjJaD11FmwMg64/fE7f0PTGyBO/r0kGLsLL -XvQOQ4pjZbQghtHkG45yp63FRuHxjw3hFmrpxEYmdWFn/0ejHjyBBwFxsA4tiu0d -ZQWWAx+/dIZ8n6MVz5MQceaKpC+x/EL9wUcSHEVF5xEa9wm9B7daewrIprERNLSq -S0XRwXFrspwUIoL0KFm/HA25LjSYRU9OlKiCCP9JsxjhhW5ExcNAxVbI0HpZY5bV -RmQ4krnQ3hYS ------END CERTIFICATE----- - diff --git a/roles/openvpn/client_tools/openvpn_client_tools.zip b/roles/openvpn/client_tools/openvpn_client_tools.zip new file mode 100644 index 0000000..b9c8ddf Binary files /dev/null and b/roles/openvpn/client_tools/openvpn_client_tools.zip differ diff --git a/roles/openvpn/client_tools/user_manual.docx b/roles/openvpn/client_tools/user_manual.docx deleted file mode 100644 index eed270f..0000000 Binary files a/roles/openvpn/client_tools/user_manual.docx and /dev/null differ diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml index 1fa6d28..1df2b08 100644 --- a/roles/openvpn/tasks/main.yml +++ b/roles/openvpn/tasks/main.yml @@ -107,18 +107,8 @@ #如果需要安装, 手动copy - name: "copy client_tools to destination server" copy: - src: "{{ role_path }}/client_tools/openvpn-install-2.4.11-I602-Win7_Win8.exe" - dest: "/etc/openvpn/client" - -- name: "copy client_tools to destination server" - copy: - src: "{{ role_path }}/client_tools/openvpn-install-2.4.11-I602-Win10.exe" - dest: "/etc/openvpn/client" - -- name: "copy client_tools to destination server" - copy: - src: "{{ role_path }}/client_tools/user_manual.docx" - dest: "/etc/openvpn/client" + src: "{{ role_path }}/client_tools/openvpn_client_tools.zip" + dest: "/opt/tsg/wannat/natgw" #默认安装openvserver, 但是不自启动, 优先使用pptpd,