- Fix that windows install will not overwrite existing service.conf

file (and ignore gui config choices if it exists).


git-svn-id: file:///svn/unbound/trunk@3772 be551aaa-1e26-0410-a405-d3ace91eadb9

doc/Changelog

@@ -3,6 +3,8 @@
 	  june).
 	- Revert fix for NetworkService account on windows due to breakage
 	  it causes.
+	- Fix that windows install will not overwrite existing service.conf
+	  file (and ignore gui config choices if it exists).
 
 7 June 2016: Ralph
 	- Lookup localzones by taglist from acl.

winrc/setup.nsi

@@ -92,10 +92,18 @@ section "-hidden.postinstall"
 	File "..\anchor-update.exe"
 	File "unbound-control-setup.cmd"
 	File "unbound-website.url"
-	File "service.conf"
 	File "..\doc\example.conf"
 	File "..\doc\Changelog"
 
+	# Does service.conf already exist?
+	IfFileExists "$INSTDIR\service.conf" 0 service_conf_not_found
+	# if so, leave it be and place the shipped file under another name
+	File "service.conf" /oname="service.conf.shipped"
+	goto end_service_conf_not_found
+	# or, it is not there, place it and fill it.
+	service_conf_not_found:
+	File "service.conf"
+
 	# Store Root Key choice
 	SectionGetFlags ${SectionRootKey} $R0
 	IntOp $R0 $R0 & ${SF_SELECTED}
@@ -111,6 +119,7 @@ section "-hidden.postinstall"
 	${Else}
 		WriteRegStr HKLM "Software\Unbound" "RootAnchor" ""
 	${EndIf}
+	end_service_conf_not_found:
 
 	# store installation folder
 	WriteRegStr HKLM "Software\Unbound" "InstallLocation" "$INSTDIR"