summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlijia <[email protected]>2021-12-01 19:13:08 +0800
committerlijia <[email protected]>2021-12-01 19:13:08 +0800
commitea53482e148b478c21549c9d8b57e750fdb67c54 (patch)
tree775e3e8f43f99951b4f00978c9fffcaf961a91b3
parent45bf7537c61d4f00729d4254ab12c10799b0f964 (diff)
默认安装openvpn, 但是不自动启动服务.
增加openvpn客户端所需文件.
-rw-r--r--deploy_env/group_vars/all.yml4
-rw-r--r--roles/openvpn/tasks/main.yml24
-rw-r--r--wannat-install.yml10
3 files changed, 29 insertions, 9 deletions
diff --git a/deploy_env/group_vars/all.yml b/deploy_env/group_vars/all.yml
index 38291a9..4bd7f21 100644
--- a/deploy_env/group_vars/all.yml
+++ b/deploy_env/group_vars/all.yml
@@ -30,8 +30,8 @@ wannat_global:
to_wangw_dst_first_port: 3545
to_wangw_listen_port: 3542
probe_pkt_timeout: 1
- g_probe_retry_times: 5
- max_item_number: 10000
+ g_probe_retry_times: 2
+ max_item_number: 100000
lru_timeout: 60
openvpn:
diff --git a/roles/openvpn/tasks/main.yml b/roles/openvpn/tasks/main.yml
index bec4503..1fa6d28 100644
--- a/roles/openvpn/tasks/main.yml
+++ b/roles/openvpn/tasks/main.yml
@@ -103,11 +103,31 @@
dest: /usr/lib/systemd/system/openvpn-server.service
tags: template
+#默认copy客户端使用的文件到服务器, 目前natgw的http_server还未支持从tsg界面下载,
+#如果需要安装, 手动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"
+
+
+#默认安装openvserver, 但是不自启动, 优先使用pptpd,
+#万一有什么特殊情况, 再手动切换
- name: "enable openvpn service"
systemd:
name: openvpn-server
daemon_reload: yes
- enabled: yes
- state: started
+ enabled: no
+ state: stopped
diff --git a/wannat-install.yml b/wannat-install.yml
index 557baa5..91896d4 100644
--- a/wannat-install.yml
+++ b/wannat-install.yml
@@ -38,11 +38,11 @@
vars_files:
- deploy_env/group_vars/all.yml
-#- hosts: openvpn
-# roles:
-# - openvpn
-# vars_files:
-# - deploy_env/group_vars/all.yml
+- hosts: openvpn
+ roles:
+ - openvpn
+ vars_files:
+ - deploy_env/group_vars/all.yml