Fixing GIT URL

diff --git a/bin/postinst b/bin/postinst
index 6514e1f81f3f1ff904ea38953359047b520d01dc..564e830da76bb47a84078d6ab64d85aabcf994ac 100644 (file)
--- a/bin/postinst
+++ b/bin/postinst
@@ -19,7 +19,9 @@ ROOT_PW_CRYPTED="\$6\$I0yXrNsT\$YU3ekjNLy1KTWLRVNww8YM1xtO8FXgTEFhOANS.HB8baj7Cx
 GIT_ACCOUNT="vmware-provisioning"
 GIT_PASSWD="shiesa&a4taich+iecah8Chu"
 GIT_REPO_DIR="postfix_config"
-GIT_REPO="https://@@acount@@:@@pwd@@@git.pixelpark.com/ppadmin/${GIT_REPO_DIR}.git"
+GIT_SERVER="git.pixelpark.com"
+#GIT_NAMESPACE="ppadmin"
+#GIT_REPO="https://@@acount@@:@@pwd@@@git.pixelpark.com/ppadmin/${GIT_REPO_DIR}.git"
 POSTFIX_MYORIGIN='pixelpark.net'
 POSTFIX_RELAYHOST='[mx.pixelpark.net]'
 
@@ -812,8 +814,9 @@ install_postfix() {
     mkdir -pv /var/tmp
     cd /var/tmp
 
-    local url=$( echo "${GIT_REPO}" | sed -e "s/@@acount@@/${GIT_ACCOUNT}/" \
-                                          -e "s/@@pwd@@/${GIT_PASSWD}/" )
+#    local url=$( echo "${GIT_REPO}" | sed -e "s/@@acount@@/${GIT_ACCOUNT}/" \
+#                                          -e "s/@@pwd@@/${GIT_PASSWD}/" )
+    local url="https://${GIT_ACCOUNT}:${GIT_PASSWD}@${GIT_SERVER}/${GIT_NAMESPACE}/${GIT_REPO_DIR}.git"
     echo "Using Git URL: '${url}' ..."
 
     git clone "${url}"