Skip to content

Modularize & Clean @jvonau's PR #2171 - uWSGI for Captive Portal & Admin Console on NGINX #2185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holta merged 18 commits into from
Jan 22, 2020
Merged

Modularize & Clean @jvonau's PR #2171 - uWSGI for Captive Portal & Admin Console on NGINX #2185

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
eec9500
don't override
jvonau Jan 19, 2020
9c19f91
use apps-enabled in place of service file
jvonau Jan 19, 2020
cad855e
adjust logging
jvonau Jan 19, 2020
fb377ee
let /etc/logrotate.d/uwsgi do its job
jvonau Jan 19, 2020
c4dea1b
clean up uwsgi.service
jvonau Jan 19, 2020
643399e
remove comment
jvonau Jan 19, 2020
2358241
move unused files
jvonau Jan 19, 2020
e25604b
managed by /etc/logrotate.d/uwsgi
jvonau Jan 19, 2020
d8b08c1
always enable uwsgi
jvonau Jan 20, 2020
2acf98a
move log directory
jvonau Jan 21, 2020
ab411ed
correct typo in capture-wsgi.py.j2
jvonau Jan 22, 2020
eb39494
handle /etc/init.d/uwsgi behavior
jvonau Jan 22, 2020
549acc3
Merge pull request #349 from iiab/master
holta Jan 22, 2020
c898fa5
Merge pull request #350 from jvonau/uwsgi
holta Jan 22, 2020
22bf00d
Create captiveportal/tasks/install.yml
holta Jan 22, 2020
112a35c
Create captiveportal/tasks/enable-or-disable.yml
holta Jan 22, 2020
91bb1cd
Modularize & clean captiveportal/tasks/main.yml
holta Jan 22, 2020
af27f90
Indent nodejs/tasks/main.yml
holta Jan 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use apps-enabled in place of service file
  • Loading branch information
@jvonau
jvonau committed Jan 22, 2020
commit 9c19f9112f2a1c1aecb8d1c5adec2832c076d8f1
60 changes: 34 additions & 26 deletions roles/captiveportal/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
- mac.template
#- roles/captiveportal/files/mac.template

- name: Install uWSGI config file /opt/iiab/captiveportal/captiveportal.ini from template
template:
src: captiveportal.ini.j2
#src: roles/captiveportal/templates/captiveportal.ini.j2
dest: /opt/iiab/captiveportal/captiveportal.ini
#- name: Install /etc/systemd/system/uwsgi-captiveportal.service from template
# template:
# src: uwsgi-captiveportal.service
# #src: roles/captiveportal/templates/uwsgi-captiveportal.service
# dest: /etc/systemd/system/

- name: "Add 'captiveportal_installed: True' to {{ iiab_state_file }}"
lineinfile:
Expand All @@ -55,25 +55,33 @@

# TO DO: move most/all 7-10 stanzas below into enable-or-disable.yml

- name: Install /etc/systemd/system/uwsgi-captiveportal.service from template
template:
src: uwsgi-captiveportal.service
#src: roles/captiveportal/templates/uwsgi-captiveportal.service
dest: /etc/systemd/system/
#- name: Restart & Enable 'uwsgi-captiveportal' systemd service (uWSGI server) that responds to browsers trying to detect a Captive Portal
# systemd:
# name: uwsgi-captiveportal
# daemon_reload: yes
# state: restarted
# enabled: True
# when: captiveportal_enabled | bool

- name: Restart & Enable 'uwsgi-captiveportal' systemd service (uWSGI server) that responds to browsers trying to detect a Captive Portal
systemd:
name: uwsgi-captiveportal
daemon_reload: yes
state: restarted
enabled: True
#- name: Stop & Disable 'uwsgi-captiveportal' systemd service (uWSGI server) if Captive Portal has been disabled
# systemd:
# name: uwsgi-captiveportal
# state: stopped
# enabled: False
# when: not captiveportal_enabled

- name: Install uWSGI config file /etc/uwsgi/apps-enabled/captiveportal.ini from template
template:
src: captiveportal.ini.j2
#src: roles/captiveportal/templates/captiveportal.ini.j2
dest: /etc/uwsgi/apps-enabled/captiveportal.ini
when: captiveportal_enabled | bool

- name: Stop & Disable 'uwsgi-captiveportal' systemd service (uWSGI server) if Captive Portal has been disabled
systemd:
name: uwsgi-captiveportal
state: stopped
enabled: False
- name: Delete uWSGI config file /etc/uwsgi/apps-enabled/captiveportal.ini when disabled
file:
#src: /etc/nginx/sites-available/capture.conf
path: /etc/uwsgi/apps-enabled/captiveportal.ini
state: absent
when: not captiveportal_enabled

- name: Run iiab-divert-to-nginx to generate diversion lists for NGINX
Expand Down Expand Up @@ -104,11 +112,11 @@
state: absent
when: not captiveportal_enabled

#- name: Restart dnsmasq
# systemd:
# name: dnsmasq
# state: restarted
# when: dnsmasq_enabled | bool
- name: Restart uwsgi
systemd:
name: uwsgi
state: restarted
daemon_reload: yes

# ABOVE DOES NOT WORK ON UBUNTU 16.04 -- what follows is a crude hack (seems to work!)

Expand Down