aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--install-win32/maketext2
-rwxr-xr-xinstall-win32/openvpn.nsi12
2 files changed, 14 insertions, 0 deletions
diff --git a/install-win32/maketext b/install-win32/maketext
index a66715c..5aed4ea 100644
--- a/install-win32/maketext
+++ b/install-win32/maketext
@@ -45,9 +45,11 @@ if [ -n "$SAMPCONF_DIR" ]; then
c=$GENOUT/conf
mkdir -p $c &>/dev/null
test -n "$SAMPCONF_CONF" && cp "../$SAMPCONF_DIR/$SAMPCONF_CONF" $c
+ test -n "$SAMPCONF_CONF2" && cp "../$SAMPCONF_DIR/$SAMPCONF_CONF2" $c
test -n "$SAMPCONF_P12" && cp "../$SAMPCONF_DIR/$SAMPCONF_P12" $c
test -n "$SAMPCONF_TA" && cp "../$SAMPCONF_DIR/$SAMPCONF_TA" $c
test -n "$SAMPCONF_CA" && cp "../$SAMPCONF_DIR/$SAMPCONF_CA" $c
test -n "$SAMPCONF_CRT" && cp "../$SAMPCONF_DIR/$SAMPCONF_CRT" $c
test -n "$SAMPCONF_KEY" && cp "../$SAMPCONF_DIR/$SAMPCONF_KEY" $c
+ test -n "$SAMPCONF_DH" && cp "../$SAMPCONF_DIR/$SAMPCONF_DH" $c
fi
diff --git a/install-win32/openvpn.nsi b/install-win32/openvpn.nsi
index 0c25d50..c33439e 100755
--- a/install-win32/openvpn.nsi
+++ b/install-win32/openvpn.nsi
@@ -505,6 +505,9 @@ Section -post
!ifdef SAMPCONF_CONF
File "${GEN}\conf\${SAMPCONF_CONF}"
!endif
+ !ifdef SAMPCONF_CONF2
+ File "${GEN}\conf\${SAMPCONF_CONF2}"
+ !endif
!ifdef SAMPCONF_P12
File "${GEN}\conf\${SAMPCONF_P12}"
!endif
@@ -520,6 +523,9 @@ Section -post
!ifdef SAMPCONF_KEY
File "${GEN}\conf\${SAMPCONF_KEY}"
!endif
+ !ifdef SAMPCONF_DH
+ File "${GEN}\conf\${SAMPCONF_DH}"
+ !endif
!endif
;
@@ -762,6 +768,9 @@ Section "Uninstall"
!ifdef SAMPCONF_CONF
Delete "$INSTDIR\config\${SAMPCONF_CONF}"
!endif
+ !ifdef SAMPCONF_CONF2
+ Delete "$INSTDIR\config\${SAMPCONF_CONF2}"
+ !endif
!ifdef SAMPCONF_P12
Delete "$INSTDIR\config\${SAMPCONF_P12}"
!endif
@@ -777,6 +786,9 @@ Section "Uninstall"
!ifdef SAMPCONF_KEY
Delete "$INSTDIR\config\${SAMPCONF_KEY}"
!endif
+ !ifdef SAMPCONF_DH
+ Delete "$INSTDIR\config\${SAMPCONF_DH}"
+ !endif
!endif
!ifdef USE_GUI