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

fixes for moving invokation to 9

Browse source
This commit is contained in:
George Hunt 2019-12-05 02:20:08 +00:00
parent ecf1b90d7c
commit 5c9354dc9a
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/9-local-addons/tasks/main.yml
View file

@ -18,9 +18,9 @@
# To be ported soon # To be ported soon
- name: CAPTIVE PORTAL - name: CAPTIVE PORTAL
include_tasks: roles/captive-portal/tasks/main.yml include_tasks: roles/captiveportal/tasks/main.yml
when: captive_portal_install | bool when: captiveportal_install | bool
tags: base, captive-portal, network, domain tags: base, captiveportal, network, domain
- name: MINETEST - name: MINETEST
include_role: include_role:

23
roles/captiveportal/tasks/main.yml
View file

@ -18,10 +18,10 @@
dest: "{{ item.dest }}" dest: "{{ item.dest }}"
mode: "{{ item.mode }}" mode: "{{ item.mode }}"
with_items: with_items:
- { src: checkurls, mode: '0644', dest: /opt/iiab/captiveportal/ } - { src: roles/captiveportal/templates/checkurls, mode: '0644', dest: /opt/iiab/captiveportal/ }
- { src: capture-wsgi.py, mode: '0755', dest: /opt/iiab/captiveportal/ } - { src: roles/captiveportal/templates/capture-wsgi.py, mode: '0755', dest: /opt/iiab/captiveportal/ }
- { src: iiab-make-cp-servers.py, mode: '0755', dest: /usr/sbin/ } - { src: roles/captiveportal/templates/iiab-make-cp-servers.py, mode: '0755', dest: /usr/sbin/ }
- { src: iiab-divert-to-nginx, mode: '0755', dest: /usr/sbin/ } - { src: roles/captiveportal/templates/iiab-divert-to-nginx, mode: '0755', dest: /usr/sbin/ }
- name: 'Copy templates: simple.template, mac.template' - name: 'Copy templates: simple.template, mac.template'
copy: copy:
@ -33,7 +33,7 @@
- name: Copy uWSGI config file - name: Copy uWSGI config file
template: template:
src: captiveportal.ini src: roles/captiveportal/templates/captiveportal.ini
dest: /etc/uwsgi/apps-available/ dest: /etc/uwsgi/apps-available/
- name: Enable uwsgi config for captiveportal - name: Enable uwsgi config for captiveportal
@ -43,9 +43,16 @@
state: link state: link
when: captiveportal_enabled | bool when: captiveportal_enabled | bool
- name: Enable nginx to service the sites in checkurls list
file:
src: /etc/nginx/sites-available/capture.conf
path: /etc/nginx/sites-enabled/capture.conf
state: link
when: captiveportal_enabled | bool
- name: Copy unit file for uWSGI service - name: Copy unit file for uWSGI service
template: template:
src: uwsgi-captiveportal.service src: roles/captiveportal/templates/uwsgi-captiveportal.service
dest: /etc/systemd/system/ dest: /etc/systemd/system/
- name: Start or restart server which responds to browsers trying to detect a captive portal - name: Start or restart server which responds to browsers trying to detect a captive portal
@ -61,10 +68,10 @@
when: not captiveportal_enabled | bool when: not captiveportal_enabled | bool
- name: Run divert to generate diversion lists for nginx - name: Run divert to generate diversion lists for nginx
shell: iiab-divert-to-nginx shell: /usr/sbin/iiab-divert-to-nginx
- name: Run script to generate nginx servers from checkurls input list - name: Run script to generate nginx servers from checkurls input list
shell: iiab-make-cp-servers.py shell: /usr/sbin/iiab-make-cp-servers.py
- name: Install nginx's captiveportal.conf from template if captiveportal_enabled - name: Install nginx's captiveportal.conf from template if captiveportal_enabled
template: template: