1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #454 from iiab/master

Sync from iiab/iiab:master
This commit is contained in:
A Holt 2020-11-27 08:06:52 -05:00 committed by GitHub
commit 51e5dee408
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 15 deletions

View file

@ -88,6 +88,9 @@ gui_static_wan_ip: "unset"
wondershaper_dspeed: "4096"
wondershaper_upspeed: "1024"
# netplan
fix_dispatcher: True
# Unused
# network_config_dir: /etc/network/interfaces.d

View file

@ -57,6 +57,12 @@
with_items:
- "{{ netplan.stdout_lines }}"
- name: Replace networkd-dispatcher #2585 for "groovy"
get_url:
url: https://gitlab.com/craftyguy/networkd-dispatcher/-/raw/2.1/networkd-dispatcher
dest: /usr/bin/networkd-dispatcher
when: internet_available and fix_dispatcher and ansible_distribution_release == "groovy"
#- name: Supply netplan template
# template:
# dest: /etc/netplan/01-iiab-config.yaml

View file

@ -1,12 +1,12 @@
#!/bin/bash -x
# Small daemon to identify this machine to the OpenVPN server
HANDLE=
UUID=
if [ -f /etc/iiab/openvpn_handle ]; then
#HANDLE=
#UUID=
#if [ -f /etc/iiab/openvpn_handle ]; then
# Option #1: Source directly from /etc/iiab/local_vars.yml in future?
# Option #2
HANDLE=`cat /etc/iiab/openvpn_handle`
HANDLE=$(cat /etc/iiab/openvpn_handle) # Sets to "" if file doesn't exist (error is ok!)
# Sourcing a variable from ~4 different places is a recipe for total confusion
# (or worse!) Far better to make variable openvpn_handle and file
@ -25,20 +25,24 @@ if [ -f /etc/iiab/openvpn_handle ]; then
# HANDLE=`cat {{ iiab_ini_file }} | gawk \
# '{ if((toupper($1) == "HANDLE") && ($2 == "=")) { print $3;}}'`
# fi
fi
HANDLE=${HANDLE// /_}
if [ -f /etc/iiab/uuid ]; then
UUID=`cat /etc/iiab/uuid`
fi
#fi
HANDLE=${HANDLE// /_} # Change all spaces to underscores
#if [ -f /etc/iiab/uuid ]; then
UUID=$(cat /etc/iiab/uuid) # Sets to "" if file doesn't exist (error is ok!)
#fi
SERVER=/usr/bin/ncat
ID=`printf "HANDLE = %s|UUID = %s" $HANDLE $UUID`
# August 2018: Removal of trailing slash tested on Raspbian, Ubuntu 18.04 & Ubuntu 16.04
#ID=$(printf "HANDLE = %s|UUID = %s" $HANDLE $UUID)
#ID=$(echo "HANDLE = ${HANDLE}|UUID = ${UUID}")
ID=$(echo "HANDLE = $HANDLE|UUID = $UUID")
# August 2018: Removal of trailing '|' tested on Raspbian, Ubuntu 18.04 & Ubuntu 16.04
#ID=`printf "HANDLE = %s|UUID = %s|" $HANDLE $UUID`
# Start the daemon which will serve the handle on demand
{% if is_debuntu %}
$SERVER -l -k -p1705 --exec "/bin/echo $ID" &
# 2020-11-23: USE 1 LINE INSTEAD OF 9 LINES, IF WE MANDATE debuntu:
#/usr/bin/ncat -l -k -p1705 --exec "/bin/echo HANDLE = $HANDLE|UUID = $UUID" &
{% else %}
source /etc/init.d/functions
PID_FILE=/var/run/openvpn/announce.pid

View file

@ -55,7 +55,7 @@ def get_zim_list(path):
zim_versions[perma_ref] = zim_info # if there are multiples, last should win
return files_processed, zim_versions
def read_library_xml(lib_xml_file, kiwix_exclude_attr=[""]): # duplicated from iiab-cmdsrv
def read_library_xml(lib_xml_file, kiwix_exclude_attr=["favicon"]): # duplicated from iiab-cmdsrv but changed
'''
Read zim properties from library.xml
Returns dict of library.xml and map of zim id to zim file name (under <dev>/library/zims)
@ -69,8 +69,7 @@ def read_library_xml(lib_xml_file, kiwix_exclude_attr=[""]): # duplicated from i
path_to_id_map (dict): A dictionary that translates zim ids to physical names
'''
kiwix_exclude_attr.append("id") # don't include id
kiwix_exclude_attr.append("favicon") # don't include large favicon
kiwix_exclude_attr.append("id") # don't include id because is key
zims_installed = {}
path_to_id_map = {}
try:
@ -108,7 +107,7 @@ def rem_libr_xml(zim_id, kiwix_library_xml):
if e.returncode != 2: # skip bogus file open error in kiwix-manage
print(outp)
def add_libr_xml(kiwix_library_xml, zim_path, zimname, zimidx):
def add_libr_xml(kiwix_library_xml, zim_path, zimname, zimidx=None):
'''
Add a zim to library.xml