free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Separate out mumble. It doesn't need to depend on prosody being installed

This commit is contained in:
Bob Mottram 2018-01-21 10:15:20 +00:00
parent fa493156d4
commit 0ddebf4dc3
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/freedombone-utils-web
View File

@ -756,24 +756,24 @@ function configure_firewall_for_web_access {
function update_default_domain { function update_default_domain {
echo $'Updating default domain' echo $'Updating default domain'
if [[ $ONION_ONLY == 'no' ]]; then if [[ $ONION_ONLY == 'no' ]]; then
if [ -d /etc/prosody ]; then if [ -f /etc/mumble-server.ini ]; then
if [ -f /etc/mumble-server.ini ]; then if [ ! -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then
if [ ! -f /etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/fullchain.pem ]; then if ! grep -q "mumble.pem" /etc/mumble-server.ini; 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|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
sed -i 's|sslKey=.*|sslKey=/var/lib/mumble-server/mumble.key|g' /etc/mumble-server.ini systemctl restart mumble
systemctl restart mumble fi
fi else
else if ! grep -q "${DEFAULT_DOMAIN_NAME}/fullchain.pem" /etc/mumble-server.ini; then
if ! grep -q "${DEFAULT_DOMAIN_NAME}/fullchain.pem" /etc/mumble-server.ini; then usermod -a -G ssl-cert mumble-server
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|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|sslKey=.*|sslKey=/etc/letsencrypt/live/${DEFAULT_DOMAIN_NAME}/privkey.pem|g" /etc/mumble-server.ini systemctl restart mumble
systemctl restart mumble
fi
fi fi
fi fi
fi
if [ -d /etc/prosody ]; then
if [ ! -d /etc/prosody/certs ]; then if [ ! -d /etc/prosody/certs ]; then
mkdir /etc/prosody/certs mkdir /etc/prosody/certs
fi fi