From 92bb2aa2acf77801bbe6b814d37b23eafc05a888 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 4 Jan 2019 13:49:04 +0000
Subject: [PATCH] Changing default domain within apps
---
src/freedombone-app-gnusocial | 9 ++++++++
src/freedombone-app-irc | 16 +++++++++++++
src/freedombone-app-keyserver | 7 ++++++
src/freedombone-app-matrix | 9 ++++++++
src/freedombone-app-mumble | 18 +++++++++++----
src/freedombone-app-nextcloud | 11 +++++++++
src/freedombone-app-postactiv | 8 +++++++
src/freedombone-app-profanity | 17 ++++++++++++++
src/freedombone-app-scuttlebot | 9 ++++++++
src/freedombone-app-vpn | 39 ++++++++++++++++++++++++++++++++
src/freedombone-app-xmpp | 10 +++++++++
src/freedombone-template | 5 +++++
src/freedombone-utils-dns | 21 +++++++++++++++++
src/freedombone-utils-turn | 34 +++++++++++++++++++---------
src/freedombone-utils-web | 41 +++++++++++++++++++---------------
15 files changed, 222 insertions(+), 32 deletions(-)
diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial
index bff295358..8827fc545 100755
--- a/src/freedombone-app-gnusocial
+++ b/src/freedombone-app-gnusocial
@@ -60,8 +60,17 @@ gnusocial_variables=(ONION_ONLY
DDNS_PROVIDER
GNUSOCIAL_TITLE
GNUSOCIAL_EXPIRE_MONTHS
+ DEFAULT_DOMAIN_NAME
MY_USERNAME)
+function change_default_domain_name_gnusocial {
+ new_default_domain_name="$1"
+
+ read_config_param GNUSOCIAL_DOMAIN_NAME
+ gnusocial_config_file="/var/www/$GNUSOCIAL_DOMAIN_NAME/htdocs/config.php"
+ sed -i "s|\$config['mail']['domain'] =.*|\$config['mail']['domain'] = '${new_default_domain_name}';|g" "$gnusocial_config_file"
+}
+
function logging_on_gnusocial {
echo -n ''
}
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index a31167504..43fc28459 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -59,6 +59,22 @@ irc_variables=(MY_USERNAME
IRC_BUFFER_LENGTH
ONION_ONLY)
+function change_default_domain_name_irc {
+ new_default_domain_name="$1"
+
+ read_config_param DEFAULT_DOMAIN_NAME
+ sed -i "s/$DEFAULT_DOMAIN_NAME/$new_default_domain_name/g" /etc/ngircd/ngircd.conf
+
+ if [ -f "/etc/ssl/certs/${new_default_domain_name}.pem" ]; then
+ sed -i "s|CertFile = .*|CertFile = /etc/ssl/certs/${new_default_domain_name}.pem|g" /etc/ngircd/ngircd.conf
+ else
+ sed -i "s|CertFile = .*|CertFile = /etc/ssl/certs/${new_default_domain_name}.crt|g" /etc/ngircd/ngircd.conf
+ fi
+ sed -i "s|DHFile = .*|DHFile = /etc/ssl/certs/${new_default_domain_name}.dhparam|g" /etc/ngircd/ngircd.conf
+ sed -i "s|KeyFile = .*|KeyFile = /etc/ssl/private/${new_default_domain_name}.key|g" /etc/ngircd/ngircd.conf
+ systemctl restart ngircd
+}
+
function logging_on_irc {
echo -n ''
}
diff --git a/src/freedombone-app-keyserver b/src/freedombone-app-keyserver
index 523e687fa..54bfcd020 100755
--- a/src/freedombone-app-keyserver
+++ b/src/freedombone-app-keyserver
@@ -46,6 +46,13 @@ keyserver_variables=(ONION_ONLY
KEYSERVER_DOMAIN_NAME
KEYSERVER_CODE)
+function change_default_domain_name_keyserver {
+ new_default_domain_name="$1"
+
+ sed -i "s|from_addr:.*|from_addr: \"pgp-public-keys@$new_default_domain_name\"|g" /etc/sks/sksconf
+ systemctl restart sks
+}
+
function check_keyserver_directory_size {
dirsize=$(du /var/lib/sks/DB | awk -F ' ' '{print $1}')
# 500M
diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 528f0d379..b6e643e83 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -73,6 +73,15 @@ matrix_variables=(ONION_ONLY
MATRIX_EXPIRE_MONTHS
MATRIX_CODE)
+function change_default_domain_name_matrix {
+ new_default_domain_name="$1"
+
+ homeserver_config="${MATRIX_DATA_DIR}/homeserver.yaml"
+ sed -i "s|$DEFAULT_DOMAIN_NAME|$new_default_domain_name|g" $homeserver_config
+ change_default_domain_name_turn "$new_default_domain_name"
+ systemctl restart matrix
+}
+
function matrix_add_onion_federation {
if grep -q ":$MATRIX_HTTP_PORT" "/etc/torrc.d/${PROJECT_NAME}"; then
return
diff --git a/src/freedombone-app-mumble b/src/freedombone-app-mumble
index 1cfb96761..d49ae47b4 100755
--- a/src/freedombone-app-mumble
+++ b/src/freedombone-app-mumble
@@ -53,6 +53,11 @@ mumble_variables=(MY_USERNAME
ONION_ONLY
ADMIN_USERNAME)
+function change_default_domain_name_mumble {
+ new_default_domain_name="$1"
+ upgrade_mumble "$new_default_domain_name"
+}
+
function logging_on_mumble {
if [ -f /etc/mumble-server.ini ]; then
sed -i 's|logfile=.*|logfile=/var/log/mumble-server.log|g' /etc/mumble-server.ini
@@ -87,21 +92,26 @@ function reconfigure_mumble {
}
function upgrade_mumble {
+ curr_default_domain_name=$DEFAULT_DOMAIN_NAME
+ if [ "$1" ]; then
+ curr_default_domain_name="$1"
+ fi
+
if [ -d /etc/letsencrypt ]; then
usermod -a -G ssl-cert mumble-server
fi
- if [ ! -f "/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem" ]; then
+ if [ ! -f "/etc/letsencrypt/live/${curr_default_domain_name}/fullchain.pem" ]; then
if ! grep -q "mumble.pem" /etc/mumble-server.ini; then
sed -i 's|sslCert=.*|sslCert=/var/lib/mumble-server/mumble.pem|g' /etc/mumble-server.ini
sed -i 's|sslKey=.*|sslKey=/var/lib/mumble-server/mumble.key|g' /etc/mumble-server.ini
systemctl restart mumble
fi
else
- if ! grep -q "${DEFAULT_DOMAIN_NAME}/fullchain.pem" /etc/mumble-server.ini; then
+ if ! grep -q "${curr_default_domain_name}/fullchain.pem" /etc/mumble-server.ini; then
usermod -a -G ssl-cert mumble-server
- sed -i "s|sslCert=.*|sslCert=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem|g" /etc/mumble-server.ini
- sed -i "s|sslKey=.*|sslKey=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/privkey.pem|g" /etc/mumble-server.ini
+ sed -i "s|sslCert=.*|sslCert=/etc/letsencrypt/live/${curr_default_domain_name}/fullchain.pem|g" /etc/mumble-server.ini
+ sed -i "s|sslKey=.*|sslKey=/etc/letsencrypt/live/${curr_default_domain_name}/privkey.pem|g" /etc/mumble-server.ini
systemctl restart mumble
fi
fi
diff --git a/src/freedombone-app-nextcloud b/src/freedombone-app-nextcloud
index 66ed777cc..93ee0a37a 100755
--- a/src/freedombone-app-nextcloud
+++ b/src/freedombone-app-nextcloud
@@ -57,6 +57,17 @@ nextcloud_variables=(ONION_ONLY
DDNS_PROVIDER
MY_USERNAME)
+function change_default_domain_name_nextcloud {
+ new_default_domain_name="$1"
+
+ read_config_param NEXTCLOUD_DOMAIN_NAME
+ STUN_SERVERS_STRING="[\"$new_default_domain_name:$TURN_PORT\"]"
+ TURN_SERVERS_STRING="[{\"server\":\"$new_default_domain_name:$TURN_PORT\",\"secret\":\"$turnkey\",\"protocols\":\"udp,tcp\"}]"
+ cd /var/www/$NEXTCLOUD_DOMAIN_NAME/htdocs || exit 36
+ sudo -u www-data ./occ config:app:set spreed stun_servers --value="$STUN_SERVERS_STRING" --output json
+ sudo -u www-data ./occ config:app:set spreed turn_servers --value="$TURN_SERVERS_STRING" --output json
+}
+
function nextcloud_check_php_init {
php_ini_file="$1"
diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv
index e66dde041..b7882d43a 100755
--- a/src/freedombone-app-postactiv
+++ b/src/freedombone-app-postactiv
@@ -60,6 +60,14 @@ postactiv_variables=(ONION_ONLY
POSTACTIV_EXPIRE_MONTHS
POSTACTIV_TITLE)
+function change_default_domain_name_postactiv {
+ new_default_domain_name="$1"
+
+ read_config_param POSTACTIV_DOMAIN_NAME
+ postactiv_config_file="/var/www/$POSTACTIV_DOMAIN_NAME/htdocs/config.php"
+ sed -i "s|\$config['mail']['domain'] =.*|\$config['mail']['domain'] = '${new_default_domain_name}';|g" "$postactiv_config_file"
+}
+
function logging_on_postactiv {
echo -n ''
}
diff --git a/src/freedombone-app-profanity b/src/freedombone-app-profanity
index 44b23e378..b6aaf2f98 100755
--- a/src/freedombone-app-profanity
+++ b/src/freedombone-app-profanity
@@ -48,6 +48,23 @@ xmpp_variables=(ONION_ONLY
DEFAULT_DOMAIN_NAME
XMPP_DOMAIN_CODE)
+function change_default_domain_name_profanity {
+ new_default_domain_name="$1"
+
+ read_config_param DEFAULT_DOMAIN_NAME
+ for d in /home/*/ ; do
+ USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+ if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
+
+ XMPP_CLIENT_DIR=/home/$USERNAME/.local/share/profanity
+ XMPP_CLIENT_ACCOUNTS=$XMPP_CLIENT_DIR/accounts
+ if [ -f "$XMPP_CLIENT_ACCOUNTS" ]; then
+ sed -i "s|$DEFAULT_DOMAIN_NAME|$new_default_domain_name|g" "$XMPP_CLIENT_ACCOUNTS"
+ fi
+ fi
+ done
+}
+
function logging_on_profanity {
echo -n ''
}
diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index 0532e451f..151415b0f 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -53,6 +53,15 @@ scuttlebot_variables=(MY_USERNAME
DEFAULT_DOMAIN_NAME
SYSTEM_TYPE)
+function change_default_domain_name_scuttlebot {
+ new_default_domain_name="$1"
+
+ { echo '{';
+ echo " \"host\": \"${new_default_domain_name}\",";
+ echo ' "tor-only": false,'; } > /etc/scuttlebot/.ssb/config
+ systemctl restart scuttlebot
+}
+
function logging_on_scuttlebot {
echo -n ''
}
diff --git a/src/freedombone-app-vpn b/src/freedombone-app-vpn
index 2f301775e..ceae08b0c 100755
--- a/src/freedombone-app-vpn
+++ b/src/freedombone-app-vpn
@@ -59,6 +59,45 @@ vpn_variables=(MY_EMAIL_ADDRESS
VPN_UNIT
VPN_TLS_PORT)
+function change_default_domain_name_vpn {
+ new_default_domain_name="$1"
+
+ for d in /home/*/ ; do
+ USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+ if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
+ user_vpn_cert_file=/home/$USERNAME/$OPENVPN_KEY_FILENAME
+
+ { echo 'client';
+ echo 'dev tun';
+ echo 'proto tcp';
+ echo "remote localhost $STUNNEL_PORT";
+ echo "route $new_default_domain_name 255.255.255.255 net_gateway";
+ echo 'resolv-retry infinite';
+ echo 'nobind';
+ echo 'tun-mtu 1500';
+ echo 'tun-mtu-extra 32';
+ echo 'mssfix 1450';
+ echo 'persist-key';
+ echo 'persist-tun';
+ echo 'auth-nocache';
+ echo 'remote-cert-tls server';
+ echo 'comp-lzo';
+ echo 'verb 3';
+ echo ''; } > "$user_vpn_cert_file"
+ chown "$USERNAME":"$USERNAME" "$user_vpn_cert_file"
+ fi
+ done
+
+ { echo '[openvpn]';
+ echo 'client = yes';
+ echo "accept = $STUNNEL_PORT";
+ echo "connect = $new_default_domain_name:$VPN_TLS_PORT";
+ echo 'cert = stunnel.pem';
+ echo 'protocol = socks'; } > /etc/stunnel/stunnel-client.conf
+
+ systemctl restart openvpn
+}
+
function logging_on_vpn {
if [ ! -f /etc/openvpn/server.conf ]; then
return
diff --git a/src/freedombone-app-xmpp b/src/freedombone-app-xmpp
index 91ba78df6..a5beb1f4d 100755
--- a/src/freedombone-app-xmpp
+++ b/src/freedombone-app-xmpp
@@ -83,6 +83,16 @@ xmpp_variables=(ONION_ONLY
DEFAULT_DOMAIN_NAME
XMPP_DOMAIN_CODE)
+function change_default_domain_name_xmpp {
+ new_default_domain_name="$1"
+
+ read_config_param DEFAULT_DOMAIN_NAME
+ sed -i "s|$DEFAULT_DOMAIN_NAME|$new_default_domain_name|g" /etc/prosody/prosody.cfg.lua
+ sed -i "s|$DEFAULT_DOMAIN_NAME|$new_default_domain_name|g" /etc/prosody/conf.avail/xmpp.cfg.lua
+
+ systemctl restart prosody
+}
+
function prosody_remove_module_from_config {
remove_prosody_module_name="$1"
prosody_config_file="$2"
diff --git a/src/freedombone-template b/src/freedombone-template
index b1d3f5317..a16ec89fb 100755
--- a/src/freedombone-template
+++ b/src/freedombone-template
@@ -309,6 +309,11 @@ echo " ${app_name_upper}_CODE"
echo ' DDNS_PROVIDER'
echo " MY_USERNAME)"
echo ''
+echo "function change_default_domain_name_${app_name} {"
+echo " new_default_domain_name=\"\$1\""
+echo ' # If anything references DEFAULT_DOMAIN_NAME then change it here'
+echo '}'
+echo ''
echo "function logging_on_${app_name} {"
echo " echo -n ''"
echo "}"
diff --git a/src/freedombone-utils-dns b/src/freedombone-utils-dns
index dc64a03c5..312836e0c 100755
--- a/src/freedombone-utils-dns
+++ b/src/freedombone-utils-dns
@@ -423,8 +423,29 @@ function change_default_domain_name {
return
fi
+ # obtain a cert for the default domain
+ if [[ "$(cert_exists "${NEW_DEFAULT_DOMAIN_NAME}" pem)" == "0" ]]; then
+ echo $'Obtaining certificate for the main domain'
+ create_site_certificate "${NEW_DEFAULT_DOMAIN_NAME}" 'yes'
+ fi
+
email_change_default_domain_name "$NEW_DEFAULT_DOMAIN_NAME"
+ # change within each app
+ FILES="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*"
+ for filename in $FILES
+ do
+ app_name=$(echo "${filename}" | awk -F '-app-' '{print $2}')
+ if [[ "$(app_is_installed "$app_name")" == "1" ]]; then
+ if grep -q "change_default_domain_name_${app_name}" "${filename}"; then
+ # shellcheck disable=SC2086
+ change_default_domain_name_${app_name} "$NEW_DEFAULT_DOMAIN_NAME"
+ fi
+ fi
+ done
+
+ sed -i "s|${DEFAULT_DOMAIN_NAME}|${NEW_DEFAULT_DOMAIN_NAME}|g" /etc/hosts
+
sed -i "/${NEW_DEFAULT_DOMAIN_NAME}/d" "$CONFIGURATION_FILE"
write_config_param DEFAULT_DOMAIN_NAME "${NEW_DEFAULT_DOMAIN_NAME}"
}
diff --git a/src/freedombone-utils-turn b/src/freedombone-utils-turn
index a30246dfd..9d5a10097 100755
--- a/src/freedombone-utils-turn
+++ b/src/freedombone-utils-turn
@@ -101,23 +101,32 @@ function remove_turn {
}
function install_turn {
- create_default_web_site
+ curr_default_domain_name=$DEFAULT_DOMAIN_NAME
+ if [ "$1" ]; then
+ curr_default_domain_name="$1"
+ if [[ "$curr_default_domain_name" != "$DEFAULT_DOMAIN_NAME" ]]; then
+ if [ -f /var/lib/turn/turnserver.conf ]; then
+ rm /var/lib/turn/turnserver.conf
+ fi
+ fi
+ fi
+ create_default_web_site "$curr_default_domain_name"
- turn_nginx_site=/etc/nginx/sites-available/$DEFAULT_DOMAIN_NAME
+ turn_nginx_site=/etc/nginx/sites-available/$curr_default_domain_name
if ! grep -q '# End of TURN Server' "$turn_nginx_site"; then
if [[ "$ONION_ONLY" == "no" ]]; then
{ echo '# TURN Server';
echo 'server {';
echo " listen ${TURN_HTTP_PORT} ssl;";
echo " listen [::]:${TURN_HTTP_PORT} ssl;";
- echo " server_name ${DEFAULT_DOMAIN_NAME};";
+ echo " server_name ${curr_default_domain_name};";
echo '';
echo ' # Security'; } >> "$turn_nginx_site"
function_check nginx_ssl
- nginx_ssl "${DEFAULT_DOMAIN_NAME}"
+ nginx_ssl "${curr_default_domain_name}"
function_check nginx_security_options
- nginx_security_options "${DEFAULT_DOMAIN_NAME}"
+ nginx_security_options "${curr_default_domain_name}"
{ echo ' add_header Strict-Transport-Security max-age=15768000;';
echo '';
@@ -131,7 +140,7 @@ function install_turn {
echo ' # Location';
echo ' location / {'; } >> "$turn_nginx_site"
function_check nginx_limits
- nginx_limits "${DEFAULT_DOMAIN_NAME}" '15m'
+ nginx_limits "${curr_default_domain_name}" '15m'
{ echo " proxy_pass http://localhost:${TURN_PORT};";
echo " proxy_set_header X-Forwarded-For \$remote_addr;";
echo ' }';
@@ -142,10 +151,10 @@ function install_turn {
fi
{ echo 'server {';
echo " listen 127.0.0.1:$TURN_ONION_PORT default_server;";
- echo " server_name $DEFAULT_DOMAIN_NAME;";
+ echo " server_name $curr_default_domain_name;";
echo ''; } >> "$turn_nginx_site"
function_check nginx_security_options
- nginx_security_options "$DEFAULT_DOMAIN_NAME"
+ nginx_security_options "$curr_default_domain_name"
{ echo '';
echo ' # Logs';
echo ' access_log /dev/null;';
@@ -154,7 +163,7 @@ function install_turn {
echo ' # Location';
echo ' location / {'; } >> "$turn_nginx_site"
function_check nginx_limits
- nginx_limits "$DEFAULT_DOMAIN_NAME" '15m'
+ nginx_limits "$curr_default_domain_name" '15m'
{ echo " proxy_pass http://localhost:${TURN_PORT};";
echo " proxy_set_header X-Forwarded-For \$remote_addr;";
echo ' }';
@@ -188,7 +197,7 @@ function install_turn {
if [ ! -f /var/lib/turn/turnserver.conf ]; then
turnkey="$(create_password 30)"
- generate_turn_key "$turnkey" /var/lib/turn/turnserver.conf "$DEFAULT_DOMAIN_NAME"
+ generate_turn_key "$turnkey" /var/lib/turn/turnserver.conf "$curr_default_domain_name"
else
turnkey=$(grep 'static-auth-secret' /var/lib/turn/turnserver.conf | awk -F '=' '{print $2}')
fi
@@ -252,4 +261,9 @@ function install_turn {
systemctl restart nginx
}
+function change_default_domain_name_turn {
+ new_default_domain_name="$1"
+ install_turn "$new_default_domain_name"
+}
+
# NOTE: deliberately no exit 0
diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web
index 9ee18dce2..61a73bd46 100755
--- a/src/freedombone-utils-web
+++ b/src/freedombone-utils-web
@@ -1120,17 +1120,22 @@ function update_default_domain {
}
function create_default_web_site {
- if [ ! -f "/etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}" ]; then
+ curr_default_domain_name=$DEFAULT_DOMAIN_NAME
+ if [ "$1" ]; then
+ curr_default_domain_name="$1"
+ fi
+
+ if [ ! -f "/etc/nginx/sites-available/${curr_default_domain_name}" ]; then
# create a web site for the default domain
- if [ ! -d "/var/www/${DEFAULT_DOMAIN_NAME}/htdocs" ]; then
- mkdir -p "/var/www/${DEFAULT_DOMAIN_NAME}/htdocs"
+ if [ ! -d "/var/www/${curr_default_domain_name}/htdocs" ]; then
+ mkdir -p "/var/www/${curr_default_domain_name}/htdocs"
if [ -d "/root/${PROJECT_NAME}" ]; then
cd "/root/${PROJECT_NAME}/website" || exit 24
- "${PROJECT_NAME}-deploy-website" "${DEFAULT_DOMAIN_NAME}"
+ "${PROJECT_NAME}-deploy-website" "${curr_default_domain_name}"
else
if [ -d "/home/${MY_USERNAME}/${PROJECT_NAME}" ]; then
cd "/home/${MY_USERNAME}/${PROJECT_NAME}" || exit 26
- "${PROJECT_NAME}-deploy-website" "${DEFAULT_DOMAIN_NAME}"
+ "${PROJECT_NAME}-deploy-website" "${curr_default_domain_name}"
fi
fi
fi
@@ -1139,18 +1144,18 @@ function create_default_web_site {
nginx_site=/etc/nginx/sites-available/$DEFAULT_DOMAIN_NAME
if [[ $ONION_ONLY == "no" ]]; then
function_check nginx_http_redirect
- nginx_http_redirect "$DEFAULT_DOMAIN_NAME"
+ nginx_http_redirect "$curr_default_domain_name"
{ echo 'server {';
echo ' listen 443 ssl;';
echo ' #listen [::]:443 ssl;';
- echo " server_name $DEFAULT_DOMAIN_NAME;";
+ echo " server_name $curr_default_domain_name;";
echo '';
echo ' # Security'; } >> "$nginx_site"
function_check nginx_ssl
- nginx_ssl "$DEFAULT_DOMAIN_NAME" mobile
+ nginx_ssl "$curr_default_domain_name" mobile
function_check nginx_security_options
- nginx_security_options "$DEFAULT_DOMAIN_NAME"
+ nginx_security_options "$curr_default_domain_name"
{ echo ' add_header Strict-Transport-Security max-age=15768000;';
echo '';
@@ -1159,7 +1164,7 @@ function create_default_web_site {
echo ' error_log /dev/null;';
echo '';
echo ' # Root';
- echo " root /var/www/$DEFAULT_DOMAIN_NAME/htdocs;";
+ echo " root /var/www/$curr_default_domain_name/htdocs;";
echo '';
echo ' # Index';
echo ' index index.html;';
@@ -1167,7 +1172,7 @@ function create_default_web_site {
echo ' # Location';
echo ' location / {'; } >> "$nginx_site"
function_check nginx_limits
- nginx_limits "$DEFAULT_DOMAIN_NAME" '15m'
+ nginx_limits "$curr_default_domain_name" '15m'
{ echo ' }';
echo '';
echo ' # Restrict access that is unnecessary anyway';
@@ -1180,22 +1185,22 @@ function create_default_web_site {
fi
{ echo 'server {';
echo " listen 127.0.0.1:$DEFAULT_DOMAIN_ONION_PORT default_server;";
- echo " server_name $DEFAULT_DOMAIN_NAME;";
+ echo " server_name $curr_default_domain_name;";
echo ''; } >> "$nginx_site"
function_check nginx_security_options
- nginx_security_options "$DEFAULT_DOMAIN_NAME"
+ nginx_security_options "$curr_default_domain_name"
{ echo '';
echo ' # Logs';
echo ' access_log /dev/null;';
echo ' error_log /dev/null;';
echo '';
echo ' # Root';
- echo " root /var/www/$DEFAULT_DOMAIN_NAME/htdocs;";
+ echo " root /var/www/$curr_default_domain_name/htdocs;";
echo '';
echo ' # Location';
echo ' location / {'; } >> "$nginx_site"
function_check nginx_limits
- nginx_limits "$DEFAULT_DOMAIN_NAME" '15m'
+ nginx_limits "$curr_default_domain_name" '15m'
{ echo ' }';
echo '';
echo ' # Restrict access that is unnecessary anyway';
@@ -1204,12 +1209,12 @@ function create_default_web_site {
echo ' }';
echo '}'; } >> "$nginx_site"
- if [ ! -f "/etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem" ]; then
+ if [ ! -f "/etc/ssl/certs/${curr_default_domain_name}.pem" ]; then
function_check create_site_certificate
- create_site_certificate "$DEFAULT_DOMAIN_NAME" 'yes'
+ create_site_certificate "$curr_default_domain_name" 'yes'
fi
- nginx_ensite "$DEFAULT_DOMAIN_NAME"
+ nginx_ensite "$curr_default_domain_name"
fi
}
--
GitLab