Merge pull request #161 from 21pages/main
use conf.d if sites-available and sites-enabled don't exist
This commit is contained in:
commit
e0138ceb39
19
install.sh
19
install.sh
@ -401,10 +401,21 @@ Do you want to install Certbot with snap? (recommended)"
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Add Nginx config
|
# Add Nginx config
|
||||||
if [ ! -f "/etc/nginx/sites-available/rustdesk.conf" ]
|
if [ -d "/etc/nginx/sites-available" ] && [ -d "/etc/nginx/sites-enabled" ]
|
||||||
then
|
then
|
||||||
touch "/etc/nginx/sites-available/rustdesk.conf"
|
SITES_CONF_DIR="sites-available"
|
||||||
cat << NGINX_RUSTDESK_CONF > "/etc/nginx/sites-available/rustdesk.conf"
|
elif [ -d "/etc/nginx/conf.d" ]
|
||||||
|
then
|
||||||
|
SITES_CONF_DIR="conf.d"
|
||||||
|
else
|
||||||
|
msg_box "Couldn't find the Nginx config directory. Please check your system!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -f "/etc/nginx/$SITES_CONF_DIR/rustdesk.conf" ]
|
||||||
|
then
|
||||||
|
touch "/etc/nginx/$SITES_CONF_DIR/rustdesk.conf"
|
||||||
|
cat << NGINX_RUSTDESK_CONF > "/etc/nginx/$SITES_CONF_DIR/rustdesk.conf"
|
||||||
server {
|
server {
|
||||||
server_name ${RUSTDESK_DOMAIN};
|
server_name ${RUSTDESK_DOMAIN};
|
||||||
location / {
|
location / {
|
||||||
@ -417,7 +428,7 @@ NGINX_RUSTDESK_CONF
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Enable the Nginx config file
|
# Enable the Nginx config file
|
||||||
if [ ! -f /etc/nginx/sites-enabled/rustdesk.conf ]
|
if [ "$SITES_CONF_DIR" = "sites-available" ] && [ ! -f /etc/nginx/sites-enabled/rustdesk.conf ]
|
||||||
then
|
then
|
||||||
ln -s /etc/nginx/sites-available/rustdesk.conf /etc/nginx/sites-enabled/rustdesk.conf
|
ln -s /etc/nginx/sites-available/rustdesk.conf /etc/nginx/sites-enabled/rustdesk.conf
|
||||||
fi
|
fi
|
||||||
|
13
restore.sh
13
restore.sh
@ -272,9 +272,18 @@ server {
|
|||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
)"
|
)"
|
||||||
echo "${rustdesknginx}" | sudo tee /etc/nginx/sites-available/rustdesk.conf >/dev/null
|
|
||||||
|
|
||||||
sudo ln -s /etc/nginx/sites-available/rustdesk.conf /etc/nginx/sites-enabled/rustdesk.conf
|
if [ -d "/etc/nginx/sites-available" ] && [ -d "/etc/nginx/sites-enabled" ]
|
||||||
|
then
|
||||||
|
echo "${rustdesknginx}" | sudo tee /etc/nginx/sites-available/rustdesk.conf >/dev/null
|
||||||
|
sudo ln -s /etc/nginx/sites-available/rustdesk.conf /etc/nginx/sites-enabled/rustdesk.conf
|
||||||
|
elif [ -d "/etc/nginx/conf.d" ]
|
||||||
|
then
|
||||||
|
echo "${rustdesknginx}" | sudo tee /etc/nginx/conf.d/rustdesk.conf >/dev/null
|
||||||
|
else
|
||||||
|
msg_box "Couldn't find the Nginx config directory. Please check your system!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
sudo ufw allow 80/tcp
|
sudo ufw allow 80/tcp
|
||||||
sudo ufw allow 443/tcp
|
sudo ufw allow 443/tcp
|
||||||
|
Loading…
x
Reference in New Issue
Block a user