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

change name of service, and test

Browse source
This commit is contained in:
George Hunt 2018-10-03 16:47:22 +00:00
parent 270fbe19d5
commit ac6c854646
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
roles/network/tasks/captive_portal.yml
View file

@ -51,8 +51,8 @@
- name: Copy Captive Portal service file - name: Copy Captive Portal service file
template: template:
src: roles/network/templates/captive-portal/captive-portal.service.j2 src: roles/network/templates/captive-portal/py-captive-portal.service.j2
dest: /etc/systemd/system/captive-portal.service dest: /etc/systemd/system/py-captive-portal.service
owner: root owner: root
group: root group: root
mode: 0644 mode: 0644
@ -69,7 +69,7 @@
- name: Enable captive-portal after copying files - name: Enable captive-portal after copying files
systemd: systemd:
name: captive-portal.service name: py-captive-portal.service
enabled: yes enabled: yes
daemon-reload: yes daemon-reload: yes
when: py_captive_portal_install and py_captive_portal_enabled when: py_captive_portal_install and py_captive_portal_enabled
@ -90,20 +90,20 @@
- name: Start captive-portal after copying files - name: Start captive-portal after copying files
systemd: systemd:
name: captive-portal.service name: py-captive-portal.service
state: started state: started
when: py_captive_portal_install and py_captive_portal_enabled when: py_captive_portal_install and py_captive_portal_enabled
- name: Disable captive-portal after copying files - name: Disable captive-portal after copying files
systemd: systemd:
name: captive-portal.service name: py-captive-portal.service
enabled: no enabled: no
daemon-reload: yes daemon-reload: yes
when: py_captive_portal_install and not py_captive_portal_enabled when: py_captive_portal_install and not py_captive_portal_enabled
- name: Stop captive-portal after copying files - name: Stop captive-portal after copying files
service: service:
name: captive-portal.service name: py-captive-portal.service
state: stopped state: stopped
when: py_captive_portal_install and not py_captive_portal_enabled when: py_captive_portal_install and not py_captive_portal_enabled

0
roles/network/templates/captive-portal/captive-portal.service.j2 → roles/network/templates/captive-portal/py-captive-portal.service.j2
View file

4
vars/default_vars.yml
View file

@ -108,7 +108,7 @@ block_DNS: False
# dnsmasq # dnsmasq
dnsmasq_install: True dnsmasq_install: True
dnsmasq_enabled: False dnsmasq_enabled: True
# Enable in local_vars.yml AFTER installing IIAB! Then run "cd /opt/iiab/iiab; ./iiab-network" # Enable in local_vars.yml AFTER installing IIAB! Then run "cd /opt/iiab/iiab; ./iiab-network"
dns_jail_enabled: False dns_jail_enabled: False
@ -119,7 +119,7 @@ captive_portal_enabled: False
# Simple python Captive Portal, that @m-anish & @jvonau are experimenting with in July 2018: github.com/iiab/iiab/pull/870 # Simple python Captive Portal, that @m-anish & @jvonau are experimenting with in July 2018: github.com/iiab/iiab/pull/870
py_captive_portal_install: True py_captive_portal_install: True
py_captive_portal_enabled: False py_captive_portal_enabled: True
# Squid # Squid
squid_install: False squid_install: False