Merge pull request ftao#88 from vmlinz/develop

shadowsocks multiport configuration

host_vars/ss_server_multiport.example.com

@@ -0,0 +1,10 @@
+---
+
+shadowsocks_servers:
+
+  multiport:
+    port_password:
+      38838: "ssserver-very-long-password-38838"
+      38839: "ssserver-very-long-password-38839"
+      38840: "ssserver-very-long-password-38840"
+    enable_udp: true

roles/ss-server/defaults/main.yml

@@ -4,8 +4,12 @@ enable_udp: true      #enable udp
 port : 5351
 password: "ssserver-very-long-password-876410482"
 method: "aes-256-cfb"
+timeout: "100"
+port_password: #port password dictionary
+  5351 : "ssserver-very-long-password-876410482"
+  5352 : "ssserver-very-long-password-876410482"
 
 shadowsocks_provider: "libev"
-
+shadowsocks_enable_multiport: false #enable multiple port config, only possible for python shadowsocks implementation
 shadowsocks_tune_system: true
 shadowsocks_change_tcp_congestion_control: false

roles/ss-server/templates/config.json

@@ -1,7 +1,11 @@
 {
   "server" : "0.0.0.0",
+{% if shadowsocks_enable_multiport and (shadowsocks_provider=="python") %}
+  "port_password" : {{ port_password | to_nice_json }},
+{% else %}
   "server_port" : {{ port }},
   "password" : "{{ password }}",
+{% endif %}
   "method": "{{ method }}",
-  "timeout": 10
+  "timeout": "{{ timeout }}"
 }

roles/ss-server/templates/ss-server.supervisor.conf

@@ -5,7 +5,3 @@ stderr_logfile = /var/log/supervisor/%(program_name)s_error.log
 stdout_logfile = /var/log/supervisor/%(program_name)s.log
 autostart=true
 autorestart=true
-
-
-
-

shadowsocks-multiport.yml

@@ -0,0 +1,13 @@
+---
+- hosts: shadowsocks-multiport
+
+  roles:
+    - common
+
+    - role: ss-server
+      name: "multiport"
+      port_password: "{{ shadowsocks_servers.multiport.port_password }}"
+      enable_udp: "{{ shadowsocks_servers.multiport.enable_udp }}"
+      shadowsocks_provider: "python"
+      shadowsocks_enable_multiport: true
+