aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2018-03-02 09:04:31 +0800
committerAaron LI <aly@aaronly.me>2018-03-14 11:35:02 +0800
commit997d7b8f6ffbf10200a85e4b78bca39c2d9a76b7 (patch)
tree18011c6d391eb6d4c02754151225cdf129cea5a1
parente2fa492dea9288dbe5ba437d2f73db50ab7b46d9 (diff)
downloadansible-dfly-vps-997d7b8f6ffbf10200a85e4b78bca39c2d9a76b7.tar.bz2
shadowsocks: rename var server_port to port
-rw-r--r--host_vars/vultr2
-rw-r--r--roles/shadowsocks/tasks/main.yml2
-rw-r--r--roles/shadowsocks/templates/config.json.j22
3 files changed, 3 insertions, 3 deletions
diff --git a/host_vars/vultr b/host_vars/vultr
index 63c82ab..b9f2db7 100644
--- a/host_vars/vultr
+++ b/host_vars/vultr
@@ -30,7 +30,7 @@ nameservers:
- ns2.1984.is
shadowsocks:
- server_port: 8989
+ port: 8989
password: "???"
method: "chacha20-ietf-poly1305"
diff --git a/roles/shadowsocks/tasks/main.yml b/roles/shadowsocks/tasks/main.yml
index 5065085..414ddee 100644
--- a/roles/shadowsocks/tasks/main.yml
+++ b/roles/shadowsocks/tasks/main.yml
@@ -19,7 +19,7 @@
config: |
"{"
"server": "{{ ansible_ssh_host }}",
- "server_port": {{ shadowsocks.server_port }},
+ "server_port": {{ shadowsocks.port }},
"local_port": 1080,
"password": "{{ shadowsocks.password }}",
"method": "{{ shadowsocks.method }}",
diff --git a/roles/shadowsocks/templates/config.json.j2 b/roles/shadowsocks/templates/config.json.j2
index 5744fec..73d3ef9 100644
--- a/roles/shadowsocks/templates/config.json.j2
+++ b/roles/shadowsocks/templates/config.json.j2
@@ -1,6 +1,6 @@
{
"server": ["::0", "0.0.0.0"],
- "server_port": {{ shadowsocks.server_port }},
+ "server_port": {{ shadowsocks.port }},
"password": "{{ shadowsocks.password }}",
"method": "{{ shadowsocks.method }}",
"timeout": 600,