fix


fix


fix
This commit is contained in:
LooseSeal2
2019-07-29 16:24:54 -07:00
parent 5f1019e94f
commit c079bf8cd2
2 changed files with 11 additions and 104 deletions

View File

@@ -15,16 +15,8 @@
pgrole: 'deluge' pgrole: 'deluge'
intport: '8112' intport: '8112'
extport: '8112' extport: '8112'
intport2: '58846' intport2: '8118'
extport2: '58846' extport2: '8118'
intport3: '58946'
extport3: '58946'
intport4: '5418'
extport4: '5418'
intport5: '5419'
extport5: '5419'
intport6: '8118'
extport6: '8118'
image: 'binhex/arch-delugevpn' image: 'binhex/arch-delugevpn'
# CORE (MANDATORY) ############################################################ # CORE (MANDATORY) ############################################################
@@ -34,6 +26,9 @@
- name: 'Including folders' - name: 'Including folders'
include_tasks: '/opt/communityapps/apps/_downloaders.yml' include_tasks: '/opt/communityapps/apps/_downloaders.yml'
- name: 'Including plugins'
include_tasks: '/opt/communityapps/apps/_plugins.yml'
- name: 'Checking for existing app data' - name: 'Checking for existing app data'
stat: stat:
path: /opt/appdata/{{pgrole}}/core.conf path: /opt/appdata/{{pgrole}}/core.conf
@@ -87,10 +82,6 @@
published_ports: published_ports:
- '{{ports.stdout}}{{extport}}:{{intport}}' - '{{ports.stdout}}{{extport}}:{{intport}}'
- '{{ports.stdout}}{{extport2}}:{{intport2}}' - '{{ports.stdout}}{{extport2}}:{{intport2}}'
- '{{ports.stdout}}{{extport3}}:{{intport3}}'
- '{{extport4}}:{{intport4}}'
- '{{extport5}}:{{intport5}}'
- '{{ports.stdout}}{{extport6}}:{{intport6}}'
volumes: '{{pg_volumes}}' volumes: '{{pg_volumes}}'
env: '{{pg_env}}' env: '{{pg_env}}'
restart_policy: unless-stopped restart_policy: unless-stopped
@@ -177,11 +168,10 @@
- name: 'Configuring {{pgrole}} for first time use' - name: 'Configuring {{pgrole}} for first time use'
block: block:
- name: set enabled_plugins - name: set enabled_plugins
lineinfile: replace:
path: '/opt/appdata/{{pgrole}}/core.conf' dest: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"enabled_plugins".*' regexp: '"enabled_plugins".*'
line: '"enabled_plugins": ["Extractor", "Label"],' replace: '"enabled_plugins": ["Extractor", "Label"],'
state: present
- name: set compact_allocation - name: set compact_allocation
lineinfile: lineinfile:
@@ -280,41 +270,6 @@
regexp: '"seed_time_ratio_limit".*' regexp: '"seed_time_ratio_limit".*'
line: '"seed_time_ratio_limit": 1.0,' line: '"seed_time_ratio_limit": 1.0,'
state: present state: present
- name: set outgoing_ports
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"outgoing_ports".*'
line: '"outgoing_ports": [{{intport5}}, {{intport5}}],'
state: present
- name: set random_port
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"random_port".*'
line: '"random_port": false,'
state: present
- name: set random_outgoing_ports
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"random_outgoing_ports".*'
line: '"random_outgoing_ports": false,'
state: present
- name: set listen_random_port
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"listen_random_port".*'
line: '"listen_random_port": null,'
state: present
- name: set listen_ports
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"listen_ports".*'
line: '"listen_ports": [{{intport4}},{{intport4}}],'
state: present
when: not confcheck.stat.exists when: not confcheck.stat.exists
- name: Restart {{pgrole}} - name: Restart {{pgrole}}

View File

@@ -15,14 +15,6 @@
pgrole: 'deluge' pgrole: 'deluge'
intport: '8112' intport: '8112'
extport: '8112' extport: '8112'
intport2: '58846'
extport2: '58846'
intport3: '58946'
extport3: '58946'
intport4: '5418'
extport4: '5418'
intport5: '5419'
extport5: '5419'
image: 'linuxserver/deluge' image: 'linuxserver/deluge'
# CORE (MANDATORY) ############################################################ # CORE (MANDATORY) ############################################################
@@ -80,10 +72,6 @@
pull: yes pull: yes
published_ports: published_ports:
- '{{ports.stdout}}{{extport}}:{{intport}}' - '{{ports.stdout}}{{extport}}:{{intport}}'
- '{{ports.stdout}}{{extport2}}:{{intport2}}'
- '{{extport3}}:{{intport3}}'
- '{{extport4}}:{{intport4}}'
- '{{extport5}}:{{intport5}}'
volumes: '{{pg_volumes}}' volumes: '{{pg_volumes}}'
env: '{{pg_env}}' env: '{{pg_env}}'
restart_policy: unless-stopped restart_policy: unless-stopped
@@ -170,11 +158,10 @@
- name: 'Configuring {{pgrole}} for first time use' - name: 'Configuring {{pgrole}} for first time use'
block: block:
- name: set enabled_plugins - name: set enabled_plugins
lineinfile: replace:
path: '/opt/appdata/{{pgrole}}/core.conf' dest: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"enabled_plugins".*' regexp: '"enabled_plugins".*'
line: '"enabled_plugins": ["Extractor", "Label"],' replace: '"enabled_plugins": ["Extractor", "Label"],'
state: present
- name: set compact_allocation - name: set compact_allocation
lineinfile: lineinfile:
@@ -273,41 +260,6 @@
regexp: '"seed_time_ratio_limit".*' regexp: '"seed_time_ratio_limit".*'
line: '"seed_time_ratio_limit": 1.0,' line: '"seed_time_ratio_limit": 1.0,'
state: present state: present
- name: set outgoing_ports
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"outgoing_ports".*'
line: '"outgoing_ports": [{{intport5}}, {{intport5}}],'
state: present
- name: set random_port
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"random_port".*'
line: '"random_port": false,'
state: present
- name: set random_outgoing_ports
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"random_outgoing_ports".*'
line: '"random_outgoing_ports": false,'
state: present
- name: set listen_random_port
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"listen_random_port".*'
line: '"listen_random_port": null,'
state: present
- name: set listen_ports
lineinfile:
path: '/opt/appdata/{{pgrole}}/core.conf'
regexp: '"listen_ports".*'
line: '"listen_ports": [{{intport4}},{{intport4}}],'
state: present
when: not confcheck.stat.exists when: not confcheck.stat.exists
- name: Restart {{pgrole}} - name: Restart {{pgrole}}