external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00
Code Issues Releases Wiki Activity

remove enabling of captive-portal service

Browse source
This commit is contained in:
George Hunt 2018-12-06 02:41:33 +00:00
parent eed584766f
commit 5f8eeacffa
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
roles/captive-portal/tasks/main.yml
View file

@ -43,13 +43,13 @@
- name: Run iiab-uncatch to generate diversion lists for dnsmasq and apache2 - name: Run iiab-uncatch to generate diversion lists for dnsmasq and apache2
shell: /usr/bin/iiab-uncatch shell: /usr/bin/iiab-uncatch
- name: Install systemd unit file captive-portal.service from template #- name: Install systemd unit file captive-portal.service from template
template: # template:
src: roles/captive-portal/templates/captive-portal.service.j2 # src: roles/captive-portal/templates/captive-portal.service.j2
dest: /etc/systemd/system/captive-portal.service # dest: /etc/systemd/system/captive-portal.service
owner: root # owner: root
group: root # group: root
mode: 0644 # mode: 0644
- name: Install Apache's captive-portal.conf from template if captive_portal_enabled - name: Install Apache's captive-portal.conf from template if captive_portal_enabled
template: template:
@ -74,20 +74,20 @@
state: link state: link
when: captive_portal_enabled and is_debuntu when: captive_portal_enabled and is_debuntu
- name: Enable & Start systemd service captive-portal.service if captive_portal_enabled #- name: Enable & Start systemd service captive-portal.service if captive_portal_enabled
systemd: # systemd:
name: captive-portal.service # name: captive-portal.service
daemon-reload: yes # daemon-reload: yes
enabled: yes # enabled: yes
state: started # state: started
when: captive_portal_enabled # when: captive_portal_enabled
- name: Disable & Stop captive-portal.service if not captive_portal_enabled #- name: Disable & Stop captive-portal.service if not captive_portal_enabled
systemd: # systemd:
name: captive-portal.service # name: captive-portal.service
enabled: no # enabled: no
state: stopped # state: stopped
when: not captive_portal_enabled # when: not captive_portal_enabled
- name: Disable Apache's captive-portal.conf if not captive_portal_enabled (debuntu) - name: Disable Apache's captive-portal.conf if not captive_portal_enabled (debuntu)
file: file: