mirror of
https://github.com/iiab/iiab.git
synced 2025-02-15 04:32:11 +00:00
Looking forward to playbook modularity (e.g. captiveportal)
This commit is contained in:
parent
3fcd5ca6ea
commit
11cec75b09
1 changed files with 12 additions and 9 deletions
|
@ -1,4 +1,4 @@
|
||||||
# TO DO: move 8-10 stanzas below into install.yml
|
# TO DO: move ~7 stanzas below into tasks/install.yml
|
||||||
|
|
||||||
- name: "Download & install packages: python3-dateutil, python3-jinja2"
|
- name: "Download & install packages: python3-dateutil, python3-jinja2"
|
||||||
package:
|
package:
|
||||||
|
@ -47,6 +47,14 @@
|
||||||
#src: roles/captiveportal/templates/captiveportal.ini.j2
|
#src: roles/captiveportal/templates/captiveportal.ini.j2
|
||||||
dest: /opt/iiab/captiveportal/captiveportal.ini
|
dest: /opt/iiab/captiveportal/captiveportal.ini
|
||||||
|
|
||||||
|
- name: "Add 'captiveportal_installed: True' to {{ iiab_state_file }}"
|
||||||
|
lineinfile:
|
||||||
|
dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml
|
||||||
|
regexp: '^captiveportal_installed'
|
||||||
|
line: 'captiveportal_installed: True'
|
||||||
|
|
||||||
|
# TO DO: move most/all 7-10 stanzas below into enable-or-disable.yml
|
||||||
|
|
||||||
- name: Install /etc/systemd/system/uwsgi-captiveportal.service from template
|
- name: Install /etc/systemd/system/uwsgi-captiveportal.service from template
|
||||||
template:
|
template:
|
||||||
src: uwsgi-captiveportal.service
|
src: uwsgi-captiveportal.service
|
||||||
|
@ -76,14 +84,6 @@
|
||||||
args:
|
args:
|
||||||
creates: /etc/nginx/sites-available/capture.conf
|
creates: /etc/nginx/sites-available/capture.conf
|
||||||
|
|
||||||
- name: "Add 'captiveportal_installed: True' to {{ iiab_state_file }}"
|
|
||||||
lineinfile:
|
|
||||||
dest: "{{ iiab_state_file }}" # /etc/iiab/iiab_state.yml
|
|
||||||
regexp: '^captiveportal_installed'
|
|
||||||
line: 'captiveportal_installed: True'
|
|
||||||
|
|
||||||
# TO DO: move (most) stuff below, and likely the 2-4 stanzas above, into enable-or-disable.yml
|
|
||||||
|
|
||||||
- name: Symlink /etc/nginx/sites-enabled/capture.conf -> /etc/nginx/sites-available/capture.conf, to enable NGINX to service the sites in checkurls list
|
- name: Symlink /etc/nginx/sites-enabled/capture.conf -> /etc/nginx/sites-available/capture.conf, to enable NGINX to service the sites in checkurls list
|
||||||
file:
|
file:
|
||||||
src: /etc/nginx/sites-available/capture.conf
|
src: /etc/nginx/sites-available/capture.conf
|
||||||
|
@ -123,3 +123,6 @@
|
||||||
name: dnsmasq
|
name: dnsmasq
|
||||||
state: started
|
state: started
|
||||||
when: dnsmasq_enabled | bool
|
when: dnsmasq_enabled | bool
|
||||||
|
|
||||||
|
# TO DO: add important captiveportal_* variable values to {{ iiab_ini_file }} =
|
||||||
|
# /etc/iiab/iiab.ini at the end of main.yml here, for /usr/bin/iiab-diagnostics
|
||||||
|
|
Loading…
Reference in a new issue