Merge pull request #325 from iiab/master

sync from iiab:master

roles/2-common/templates/iiab_lib.py

@@ -10,6 +10,7 @@ import xml.etree.ElementTree as ET
 import iiab.iiab_const as CONST
 
 lang_codes = {}
+lang_iso2_codes = {}
 
 def get_zim_list(path):
     '''
@@ -139,8 +140,11 @@ def read_lang_codes():
         #print("menu.json:%s"%reads)
         lang_codes = json.loads(reads)
 
-# there is a different algorithm in get_zim_list above
+    # create iso2 index
+    for lang in lang_codes:
+        lang_iso2_codes[lang_codes[lang]['iso2']  ] = lang
 
+# there is a different algorithm in get_zim_list above
 def calc_perma_ref(uri):
     '''Given a path or url return the generic zim name'''
     url_slash = uri.split('/')

vars/default_vars.yml

@@ -339,6 +339,7 @@ azuracast_https_port: 10443
 # being reserved for AzuraCast:
 azuracast_port_range_prefix: 10
 
+# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056
 dokuwiki_install: False
 dokuwiki_enabled: False
 dokuwiki_url: /dokuwiki

vars/local_vars_big.yml

@@ -206,8 +206,9 @@ iiab_usb_lib_show_all: True
 azuracast_install: False
 azuracast_enabled: False
 
-dokuwiki_install: True
-dokuwiki_enabled: True
+# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056
+dokuwiki_install: False
+dokuwiki_enabled: False
 
 mediawiki_install: True
 mediawiki_enabled: True

vars/local_vars_medium.yml

@@ -206,6 +206,7 @@ iiab_usb_lib_show_all: True
 azuracast_install: False
 azuracast_enabled: False
 
+# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056
 dokuwiki_install: False
 dokuwiki_enabled: False
 

vars/local_vars_min.yml

@@ -206,6 +206,7 @@ iiab_usb_lib_show_all: True
 azuracast_install: False
 azuracast_enabled: False
 
+# Unmaintained as of January 2020: https://github.com/iiab/iiab/issues/2056
 dokuwiki_install: False
 dokuwiki_enabled: False