WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-10-01 06:04:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

install script update

Browse Source 
git-svn-id: file:///svn/unbound/trunk@2285 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards
2010-10-13 14:06:31 +00:00
parent a26f3d70dc
commit 66b2b90f43
2 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
winrc/setup.nsi
+26 -3
View File
@@ -70,6 +70,11 @@ section "Unbound" SectionUnbound
# real work in postinstall
sectionEnd
section "Root anchor - DNSSEC" SectionRootKey
# add estimated size for key (Kb)
AddSize 2
sectionEnd
section "DLV - dlv.isc.org" SectionDLV
# add estimated size for key (Kb)
AddSize 2
@@ -105,6 +110,22 @@ section "-hidden.postinstall"
File "service.conf"
File "..\doc\example.conf"
# Store Root Key choice
SectionGetFlags ${SectionRootKey} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
${If} $R0 == ${SF_SELECTED}
ClearErrors
FileOpen $R1 "$INSTDIR\service.conf" a
IfErrors done
FileSeek $R1 0 END
FileWrite $R1 "$\nserver: auto-trust-anchor-file: $\"$INSTDIR\root.key$\"$\n"
FileClose $R1
done:
WriteRegStr HKLM "Software\Unbound" "RootAnchor" "yes"
${Else}
WriteRegStr HKLM "Software\Unbound" "RootAnchor" "no"
${EndIf}
# Store DLV choice
SectionGetFlags ${SectionDLV} $R0
IntOp $R0 $R0 & ${SF_SELECTED}
@@ -118,7 +139,7 @@ section "-hidden.postinstall"
done:
WriteRegStr HKLM "Software\Unbound" "CronAction" "$\"$INSTDIR\anchor-update.exe$\" dlv.isc.org $\"$INSTDIR\dlv.isc.org.key$\""
${Else}
WriteRegStr HKLM "Software\Unbound" "CronAction" "$\"$INSTDIR\anchor-update.exe$\" "
WriteRegStr HKLM "Software\Unbound" "CronAction" ""
${EndIf}
# store installation folder
@@ -153,10 +174,12 @@ sectionEnd
# set section descriptions
LangString DESC_unbound ${LANG_ENGLISH} "The base unbound DNS(SEC) validating caching resolver. $\r$\n$\r$\nIt can be found in the Services control panel, and a config file is in the Program Files folder."
LangString DESC_dlv ${LANG_ENGLISH} "Set up to use DLV with dlv.isc.org. Downloads the key with a leap of faith. $\r$\n$\r$\nThis provides public keys that are used for security verification."
LangString DESC_rootkey ${LANG_ENGLISH} "Set up to use the DNSSEC root trust anchor. It is automatically updated. $\r$\n$\r$\nThis provides the main key that is used for security verification."
LangString DESC_dlv ${LANG_ENGLISH} "Set up to use DLV with dlv.isc.org. Downloads the key with a leap of faith. $\r$\n$\r$\nThis provides additional public keys that are used for security verification, but your queries (websites) are sent to a remote server to fetch them."
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SectionUnbound} $(DESC_unbound)
!insertmacro MUI_DESCRIPTION_TEXT ${SectionRootKey} $(DESC_rootkey)
!insertmacro MUI_DESCRIPTION_TEXT ${SectionDLV} $(DESC_dlv)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
@@ -197,5 +220,5 @@ section "un.Unbound"
Delete "$SMPROGRAMS\$StartMenuFolder\unbound.net website.lnk"
RMDir "$SMPROGRAMS\$StartMenuFolder"
DeleteRegKey /ifempty HKLM "Software\Unbound"
DeleteRegKey HKLM "Software\Unbound"
sectionEnd
winrc/win_svc.c
+2 -2
View File
@@ -468,7 +468,7 @@ win_do_cron(void* ATTR_UNUSED(arg))
char* cronaction;
log_thread_set(&mynum);
cronaction = lookup_reg_str("Software\\Unbound", "CronAction");
if(cronaction) {
if(cronaction && strlen(cronaction)>0) {
STARTUPINFO sinfo;
PROCESS_INFORMATION pinfo;
memset(&pinfo, 0, sizeof(pinfo));
@@ -484,7 +484,7 @@ win_do_cron(void* ATTR_UNUSED(arg))
CloseHandle(pinfo.hThread);
}
free(cronaction);
}
} else if(cronaction) free(cronaction);
/* stop self */
CloseHandle(cron_thread);
cron_thread = NULL;