mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
commit
8cce91be76
4 changed files with 8 additions and 7 deletions
|
@ -14,7 +14,7 @@
|
||||||
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
|
# All above are set in: github.com/iiab/iiab/blob/master/vars/default_vars.yml
|
||||||
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
|
# If nec, change them by editing /etc/iiab/local_vars.yml prior to installing!
|
||||||
|
|
||||||
calibreweb_version: 0.6.5 # WAS: master, 0.6.4
|
calibreweb_version: 0.6.6 # WAS: master, 0.6.4, 0.6.5
|
||||||
|
|
||||||
calibreweb_venv_path: /usr/local/calibre-web
|
calibreweb_venv_path: /usr/local/calibre-web
|
||||||
calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"
|
calibreweb_exec_path: "{{ calibreweb_venv_path }}/cps.py"
|
||||||
|
|
|
@ -36,6 +36,10 @@
|
||||||
state: absent
|
state: absent
|
||||||
when: not captiveportal_enabled
|
when: not captiveportal_enabled
|
||||||
|
|
||||||
|
- name: Run iiab-divert-to-nginx to generate diversion lists for NGINX
|
||||||
|
shell: /usr/sbin/iiab-divert-to-nginx
|
||||||
|
when: captiveportal_enabled | bool
|
||||||
|
|
||||||
- name: Delete /etc/dnsmasq.d/capture to make sure dnsmasq is not diverting (if not captiveportal_enabled)
|
- name: Delete /etc/dnsmasq.d/capture to make sure dnsmasq is not diverting (if not captiveportal_enabled)
|
||||||
file:
|
file:
|
||||||
path: /etc/dnsmasq.d/capture
|
path: /etc/dnsmasq.d/capture
|
||||||
|
|
|
@ -44,9 +44,6 @@
|
||||||
- simple.template
|
- simple.template
|
||||||
- mac.template
|
- mac.template
|
||||||
|
|
||||||
- name: Run iiab-divert-to-nginx to generate diversion lists for NGINX
|
|
||||||
shell: /usr/sbin/iiab-divert-to-nginx
|
|
||||||
|
|
||||||
- name: Run iiab-make-cp-servers.py to generate NGINX servers from /opt/iiab/captiveportal/checkurls input list (creates /etc/nginx/sites-available/capture.conf)
|
- name: Run iiab-make-cp-servers.py to generate NGINX servers from /opt/iiab/captiveportal/checkurls input list (creates /etc/nginx/sites-available/capture.conf)
|
||||||
command: /usr/sbin/iiab-make-cp-servers.py
|
command: /usr/sbin/iiab-make-cp-servers.py
|
||||||
args:
|
args:
|
||||||
|
|
|
@ -26,9 +26,9 @@ kiwix_library_xml: "{{ iiab_zim_path }}/library.xml"
|
||||||
# http://download.kiwix.org/release/kiwix-tools/ ...or sometimes...
|
# http://download.kiwix.org/release/kiwix-tools/ ...or sometimes...
|
||||||
# http://download.kiwix.org/nightly/
|
# http://download.kiwix.org/nightly/
|
||||||
|
|
||||||
kiwix_version_armhf: "kiwix-tools_linux-armhf-3.0.2"
|
kiwix_version_armhf: "kiwix-tools_linux-armhf-3.0.3"
|
||||||
kiwix_version_linux64: "kiwix-tools_linux-x86_64-3.0.2"
|
kiwix_version_linux64: "kiwix-tools_linux-x86_64-3.0.3"
|
||||||
kiwix_version_i686: "kiwix-tools_linux-i586-3.0.2"
|
kiwix_version_i686: "kiwix-tools_linux-i586-3.0.3"
|
||||||
|
|
||||||
# kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
|
# kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
|
||||||
# v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")
|
# v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue