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

softcode apache_config_dir in iiab-make-apache-config.py (#81)

Browse source 
* softcode apache_config_dir in iiab-make-apache-config.py

* softcode iiab_zim_path in iiab-make-apache-config.py

* softcode iiab-make-kiwix-lib.py
This commit is contained in:
Jerry Vonau 2017-07-04 15:05:10 -05:00 • committed by georgejhunt
parent e4226e8515
commit 0f9d25ab7c
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/kiwix/templates/iiab-make-apache-config.py
View file

@ -3,8 +3,8 @@
import os, sys, syslog
iiab_zim_path = "/library/zims"
kiwix_apache_config = "/etc/apache2/sites-available/kiwix.conf"
iiab_zim_path = "{{ iiab_zim_path }}"
kiwix_apache_config = "/etc/{{ apache_config_dir }}/kiwix.conf"
def main ():
content = iiab_zim_path + "/content/"

15
roles/kiwix/templates/iiab-make-kiwix-lib.py
View file

@ -5,6 +5,7 @@
Creates library.xml file for kiwix from contents of /zims/content and index
Author: Tim Moody <tim(at)timmoody(dot)com>
Contributors: Jerry Vonau <jvonau3(at)gmail.com>
"""
@ -18,20 +19,20 @@ import re
import subprocess
import shlex
import ConfigParser
XSCE_PATH='/etc/iiab'
if not XSCE_PATH in sys.path:
sys.path.append(XSCE_PATH)
IIAB_PATH='/etc/iiab'
if not IIAB_PATH in sys.path:
sys.path.append(IIAB_PATH)
from iiab_env import get_iiab_env
# Config Files
iiab_config_file = "/etc/iiab/iiab.ini"
iiab_config_file = "{{ iiab_config_file }}"
# Variables that should be read from config file
# All of these variables will be read from config files and recomputed in init()
iiab_zim_path = "/library/zims"
kiwix_library_xml = "/library/zims/library.xml"
iiab_zim_path = "{{ iiab_zim_path }}"
kiwix_library_xml = "{{ kiwix_library_xml }}"
iiab_base_path = "/opt/schoolserver"
iiab_base_path = "{{ iiab_base }}"
kiwix_manage = iiab_base_path + "/kiwix/bin/kiwix-manage"
doc_root = get_iiab_env('WWWROOT')
zim_version_idx = doc_root + "/common/assets/zim_version_idx.json"