Skip to content

Commit d72f24b

Browse files
authored
Update installUpgradeFunctions.sh: Add XX_ALLSKY_WEB_LOGS_XX
and rename another variable, plus delete no-longer-used variables
1 parent 40e7c8b commit d72f24b

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

scripts/installUpgradeFunctions.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,11 @@ export ALLSKY_REPO="${ALLSKY_HOME}/config_repo"
2222
export REPO_WEBCONFIG_FILE="${ALLSKY_REPO}/${ALLSKY_WEBSITE_CONFIGURATION_NAME}.repo"
2323
export REPO_SUDOERS_FILE="${ALLSKY_REPO}/sudoers.repo"
2424
export REPO_LIGHTTPD_FILE="${ALLSKY_REPO}/lighttpd.conf.repo"
25-
export REPO_AVI_FILE="${ALLSKY_REPO}/avahi-daemon.conf.repo"
25+
export REPO_AVAHI_FILE="${ALLSKY_REPO}/avahi-daemon.conf.repo"
2626
export REPO_OPTIONS_FILE="${ALLSKY_REPO}/$( basename "${ALLSKY_OPTIONS_FILE}" ).repo"
2727
export REPO_ENV_FILE="${ALLSKY_REPO}/$( basename "${ALLSKY_ENV}" ).repo"
2828
export REPO_WEBSITE_CONFIGURATION_FILE="${ALLSKY_REPO}/${ALLSKY_WEBSITE_CONFIGURATION_NAME}.repo"
2929

30-
##### Information on prior Allsky versions and files.
31-
# Location of old-style WebUI and Website.
32-
# TODO: delete these two in v2025.xx.xx
33-
export OLD_WEBUI_LOCATION="/var/www/html"
34-
export OLD_WEBSITE_LOCATION="${OLD_WEBUI_LOCATION}/allsky"
35-
3630
# Directory of prior version of Allsky, if it exists.
3731
export ALLSKY_PRIOR_DIR="$( dirname "${ALLSKY_HOME}" )/${ALLSKY_INSTALL_DIR}-OLD"
3832
# Prior "config" directory, if it exists.
@@ -49,7 +43,7 @@ export WEBSITE_CONFIG_VERSION="ConfigVersion"
4943
export WEBSITE_ALLSKY_VERSION="config.AllskyVersion"
5044

5145
# Location of prior files varies by release; this is most recent location.
52-
# TODO: delete these two in v2025.xx.xx
46+
# TODO: delete these two in release after v2026...
5347
export PRIOR_CONFIG_FILE="${PRIOR_CONFIG_DIR}/config.sh"
5448
export PRIOR_FTP_FILE="${PRIOR_CONFIG_DIR}/ftp-settings.sh"
5549

@@ -822,6 +816,7 @@ function create_lighttpd_config_file()
822816
-e "s;XX_ALLSKY_CURRENT_DIR_XX;${ALLSKY_CURRENT_DIR};g" \
823817
-e "s;XX_ALLSKY_IMAGES_XX;${ALLSKY_IMAGES};g" \
824818
-e "s;XX_ALLSKY_WEBSITE_XX;${ALLSKY_WEBSITE};g" \
819+
-e "s;XX_ALLSKY_WEB_LOGS_XX;${ALLSKY_WEB_LOGS};g" \
825820
-e "s;XX_ALLSKY_DOCUMENTATION_XX;${ALLSKY_DOCUMENTATION};g" \
826821
-e "s;XX_ALLSKY_OVERLAY_XX;${ALLSKY_OVERLAY};g" \
827822
-e "s;XX_ALLSKY_MY_OVERLAY_TEMPLATES_XX;${ALLSKY_MY_OVERLAY_TEMPLATES};g" \

0 commit comments

Comments
 (0)