1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-12 11:12:06 +00:00

Remove legacy code from iiab-install

This commit is contained in:
A Holt 2020-08-05 14:17:58 -04:00 committed by GitHub
parent 97f91177c8
commit 853ddf1a1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -145,36 +145,7 @@ if [ "$STAGE" -lt 2 ] && [ "$1" == "--debug" ]; then
echo -e "\n'--debug' *ignored* as STAGE (counter) < 2." echo -e "\n'--debug' *ignored* as STAGE (counter) < 2."
fi fi
# TEMPORARY: Catch images up to current code to benefit from pre-installed apps # /etc/iiab/iiab_state.yml is mandatory and must be created here. Background:
# Workaround for (web-published) images; will go away later
# Assumes /etc/iiab/iiab_state.yml is not created until (prior run of) Stage 4 but
# config_vars2.yml is present with the stage counter altered by pi-gen to be 2.
if [ -f /etc/iiab/config_vars2.yml ]; then
mv /etc/iiab/config_vars2.yml $IIAB_STATE_FILE
# Fix up prior values in state file
# mongo role improved post image creation
if grep -q sugar $IIAB_STATE_FILE && ! grep -q mongodb $IIAB_STATE_FILE; then
echo "mongodb_installed: True" >> $IIAB_STATE_FILE
fi
# TEMPORARY: another change to account for
# sed -i -e 's/pan_bluetooth/bluetooth/' $IIAB_STATE_FILE
if [ "$STAGE" -eq 2 ]; then
echo -e "\nCompleting Stage 3 from IIAB image (starts systemd service iiab-setup-db to run the 'mysql' role)."
systemctl start iiab-setup-db
fi
PLAYBOOK="iiab-from-console.yml" # Stage 4-9 then Network Role
ARGS="" # Removes '--extra-vars reinstall=True' if --reinstall, BUT WHY?
# The same as --reinstall except Stage 3 is not run as there are no other functional
# changes in Stage 3 to account for post image creation, once the above is run.
# reinstall=True would force kiwix to re-download and re-install in commit
# ce2ec3b0cad76449caf3299003b5d297a3164181
## End image catch up
fi
# Allow iiab-install to read IIAB_STATE_FILE to not repeat installs of previous # Allow iiab-install to read IIAB_STATE_FILE to not repeat installs of previous
# roles that already completed within the stage. # roles that already completed within the stage.
if [ ! -f $IIAB_STATE_FILE ]; then if [ ! -f $IIAB_STATE_FILE ]; then