- do not delete service.conf on windows uninstall.

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

diff --git a/doc/Changelog b/doc/Changelog
index d9a754af98b9c6816969615449d9b883c3139aa6..398f961e01d072a42a8f69899f4473a62fbc71ee 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
          so that include: file below that is relative to that directory.
          With chroot, make the directory an absolute path inside chroot.
        - keep debug symbols in windows build.
+       - do not delete service.conf on windows uninstall.
 
 9 June 2016: Wouter
        - Trunk is called 1.5.10 (with previous fixes already in there to 2

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 15735933accded9e574616bc0457d055ac6497dd..d70c56b659e352663804e41a9392aaf4f6794b19 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -188,7 +188,8 @@ section "un.Unbound"
        Delete "$INSTDIR\anchor-update.exe"
        Delete "$INSTDIR\unbound-control-setup.cmd"
        Delete "$INSTDIR\unbound-website.url"
-       Delete "$INSTDIR\service.conf"
+       # keep the service.conf with potential local modifications
+       #Delete "$INSTDIR\service.conf"
        Delete "$INSTDIR\service.conf.shipped"
        Delete "$INSTDIR\example.conf"
        Delete "$INSTDIR\Changelog"