Grant access on DATA_DIR to domain user before initdb starting

dmpgpro · dmpgpro · commit 7215d6cd6243 · 2018-03-30T16:17:28.000+03:00
diff --git a/nsis/postgresql.nsi b/nsis/postgresql.nsi
@@ -368,10 +368,8 @@ Section $(PostgreSQLString) sec1
     ;AccessControl::GrantOnFile "$DATA_DIR" "(BU)" "FullAccess" ;GenericWrite
     ;Pop $0 ;"ok" or "error" + error details
 
-    ;;;AccessControl::GrantOnFile "$DATA_DIR" "$ServiceAccount_text" "FullAccess"
-    ;;;Pop $0 ;"ok" or "error" + error details
-    ;;;AccessControl::GrantOnFile "$DATA_DIR" "$loggedInUser" "FullAccess" ;GenericWrite
-    ;;;Pop $0 ;"ok" or "error" + error details
+    DetailPrint "GRANT FullAccess ON $DATA_DIR TO $loggedInUser"
+    AccessControl::GrantOnFile "$DATA_DIR" "$loggedInUser" "FullAccess" ;GenericWrite
     DetailPrint "GRANT FullAccess ON $DATA_DIR TO $loggedInUserShort"
     AccessControl::GrantOnFile "$DATA_DIR" "$loggedInUserShort" "FullAccess"
     Pop $0
@@ -471,12 +469,6 @@ Section $(PostgreSQLString) sec1
   DetailPrint "GRANT FullAccess ON $DATA_DIR TO $ServiceAccount_text"
   AccessControl::GrantOnFile "$DATA_DIR" "$ServiceAccount_text" "FullAccess"
   Pop $0 ;"ok" or "error" + error details
-  DetailPrint "GRANT FullAccess ON $DATA_DIR TO $loggedInUser"
-  AccessControl::GrantOnFile "$DATA_DIR" "$loggedInUser" "FullAccess" ;GenericWrite
-  Pop $0 ;"ok" or "error" + error details
-  DetailPrint "GRANT FullAccess ON $DATA_DIR TO $loggedInUserShort"
-  AccessControl::GrantOnFile "$DATA_DIR" "$loggedInUserShort" "FullAccess" ;GenericWrite
-  Pop $0 ;"ok" or "error" + error details
 
   DetailPrint "GRANT GenericRead + GenericExecute ON $INSTDIR TO $ServiceAccount_text"
   AccessControl::GrantOnFile "$INSTDIR" "$ServiceAccount_text" "GenericRead + GenericExecute"
@@ -486,17 +478,18 @@ Section $(PostgreSQLString) sec1
   AccessControl::GrantOnFile "$DATA_DIR\postgresql.conf" "$ServiceAccount_text" "FullAccess"
   Pop $0 ;"ok" or "error" + error details
   DetailPrint "GRANT FullAccess ON $DATA_DIR\postgresql.conf TO $loggedInUser"
-  AccessControl::GrantOnFile "$DATA_DIR\postgresql.conf" "$loggedInUser" "FullAccess" ;"GenericRead + GenericExecute" ;GenericWrite
+  AccessControl::GrantOnFile "$DATA_DIR\postgresql.conf" "$loggedInUser" "FullAccess"
   Pop $0 ;"ok" or "error" + error details
   DetailPrint "GRANT FullAccess ON $DATA_DIR\postgresql.conf TO $loggedInUserShort"
-  AccessControl::GrantOnFile "$DATA_DIR\postgresql.conf" "$loggedInUserShort" "FullAccess" ;GenericWrite
+  AccessControl::GrantOnFile "$DATA_DIR\postgresql.conf" "$loggedInUserShort" "FullAccess"
   Pop $0 ;"ok" or "error" + error details
 
   DetailPrint "GRANT FullAccess ON $INSTDIR\scripts TO $loggedInUser"
   AccessControl::GrantOnFile "$INSTDIR\scripts" "$loggedInUser" "FullAccess"
   DetailPrint "GRANT GenericRead + GenericExecute ON $INSTDIR\scripts\pgpro_upgrade.cmd TO $loggedInUser"
   AccessControl::GrantOnFile "$INSTDIR\scripts\pgpro_upgrade.cmd" "$loggedInUser" "GenericRead + GenericExecute"
   Pop $0 ;"ok" or "error" + error details
+  
   ${if} $isDataDirExist == 1
     ; there exist data directory. We need to stop service,
     ; run pgpro-upgrade script and
