Merge pull request #514 from bluecherrydvr/subdomainconf_fix

Don't overwrite nginx config for subdomain.conf if it exists
bluecherrydvr · Sep 18, 2021 · 127ab3e · 127ab3e
2 parents 437fc30 + 57bea75
commit 127ab3e
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/misc/postinstall.sh b/misc/postinstall.sh
@@ -390,6 +390,12 @@ case "$1" in
 				echo "tw5864" >> /etc/modules
 			fi
 		fi
+
+		# If subdomain.conf exists don't use snakeoil
+
+		if test -f "/usr/share/bluecherry/nginx-includes/subdomain.conf"; then
+		sed -i 's/snakeoil.conf/subdomain.conf/g' /etc/nginx/sites-enabled/bluecherry.conf
+		fi
 
 		# Install pip3 dependencies
 		pip3 install --user setuptools_rust certbot certbot-dns-subdomain-provider