From 997d7b8f6ffbf10200a85e4b78bca39c2d9a76b7 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Fri, 2 Mar 2018 09:04:31 +0800 Subject: shadowsocks: rename var server_port to port --- host_vars/vultr | 2 +- roles/shadowsocks/tasks/main.yml | 2 +- roles/shadowsocks/templates/config.json.j2 | 2 +- 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, -- cgit v1.2.2