Skip to content
Snippets Groups Projects
Commit ec1868e2 authored by Bob Mottram's avatar Bob Mottram
Browse files

Set default domain name

parent 7d720d07
No related branches found
No related tags found
No related merge requests found
......@@ -441,8 +441,13 @@ function web_admin_create_installed_apps {
read_config_param "${app_name_upper}_DOMAIN_NAME"
read_config_param ONION_ONLY
if [[ "$ONION_ONLY" == 'no' ]]; then
test_domain_name="${app_name_upper}_DOMAIN_NAME"
domain_name=${!test_domain_name}
if grep -q "INSTALLED_ON_DEFAULT_DOMAIN=1" "$app_filename"; then
read_config_param DEFAULT_DOMAIN_NAME
domain_name=$DEFAULT_DOMAIN_NAME
else
test_domain_name="${app_name_upper}_DOMAIN_NAME"
domain_name=${!test_domain_name}
fi
else
domain_name=$(cat "/var/lib/tor/hidden_service_${app_name}/hostname")
fi
......@@ -485,13 +490,10 @@ function web_admin_create_installed_apps {
sed -i "s|APPNAME|${app_name}|g" "$filename"
sed -i "s|ONIONURL|http://${onion_domain_name}|g" "$filename"
if [[ "$ONION_ONLY" != 'no' ]]; then
if ! grep -q "INSTALLED_ON_DEFAULT_DOMAIN=1" "$app_filename"; then
if ! grep -q "INSTALLED_ON_DEFAULT_DOMAIN=y" "$app_filename"; then
sed -i '/APPURL/d' "$filename"
fi
fi
sed -i '/APPURL/d' "$filename"
else
sed -i "s|APPURL|${domain_name}|g" "$filename"
fi
sed -i "s|APPURL|${domain_name}|g" "$filename"
sed -i "s|APPDESCRIPTION|${DESCRIPTION}|g" "$filename"
installed_apps_ctr=$((installed_apps_ctr+1))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment