Commit 42bc771b authored by rgaudin's avatar rgaudin
Browse files

installing captive portal back in reconfigure and disabling dnsmasq so pip can access internet

parent 806a2ede
...@@ -19,6 +19,17 @@ ...@@ -19,6 +19,17 @@
mode: 0755 mode: 0755
tags: master tags: master
- name: Remove {{ captive_root }}
file:
dest: "{{ captive_root }}"
state: absent
tags: ["master", "reconfigure"]
- name: disable dnsmasq temporarily
become: yes
command: systemctl stop dnsmasq
tags: ["master", "reconfigure"]
- name: Copy {{ captive_root }} folder - name: Copy {{ captive_root }} folder
copy: copy:
src: captiveportal src: captiveportal
...@@ -27,19 +38,19 @@ ...@@ -27,19 +38,19 @@
group: "{{ username }}" group: "{{ username }}"
mode: 0755 mode: 0755
notify: restart uwsgi notify: restart uwsgi
tags: ["master", "setup"] tags: ["master", "reconfigure"]
- name: create venv - name: create venv
become: yes become: yes
become_user: "{{ username }}" become_user: "{{ username }}"
command: virtualenv -p python3 {{ captive_env }} command: virtualenv -p python3 {{ captive_env }}
tags: ["master", "setup"] tags: ["master", "reconfigure"]
- name: Install captive portal deps - name: Install captive portal deps
pip: pip:
requirements: "{{ captive_root }}/requirements.txt" requirements: "{{ captive_root }}/requirements.txt"
virtualenv: "{{ captive_env }}" virtualenv: "{{ captive_env }}"
tags: ["master", "setup"] tags: ["master", "reconfigure"]
- name: Add nginx specific configuration file - name: Add nginx specific configuration file
template: template:
......
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
notify: restart nginx notify: restart nginx
tags: master tags: master
# copy branding again in reconfigure to allow out-of-master updates
- name: Copy static files (general branding) - name: Copy static files (general branding)
copy: copy:
src: static src: static
dest: /var/www/ dest: /var/www/
tags: master tags: ["master", "reconfigure"]
- name: copy blank homepage - name: copy blank homepage
template: template:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment