Cleaning up post-config changes

albert/post.cfg

@@ -4,31 +4,36 @@
 ## -- doesn't common/post.cfg ought to take care of this. 
 
 
+
+
+
+## -- not certain why these are needed, as puppet uses the "deploy" alias to pull things down.
+#curl -X POST "https://config.tombstones.org.uk:23000/api/v1/user/keys" \
+#-H "accept: application/json" \
+#-H "Content-Type: application/json" \
+#-H "Authorization: token 2b2182bbbb7e52b3193c4c9718c6e96c372f8156" \
+#-d "{  \"key\": \"$(cat /root/.ssh/id_rsa.pub)\",  \"read_only\": true,  \"title\": \"$(hostname -s)-postcfg-$(date +'%s')\"}"
+
 ### PUPPET - pull down additional manifests
 #
 #echo "Pull down the puppet manifests"
 cd /var/lib/puppet/manifests
 
+## -- fixed these lines to use the alias:
+## .. should be in the format of: 
+# -- php
+#git clone ssh://git@config.tombstones.org.uk:22022/tombstones/puppet-php.git
+#git clone deploy:/tombstones/puppet-php.git
+
 # -- apache
-#git clone ssh://deploy:/tombstones/puppet-httpd.git
 #git clone ssh://git@config.tombstones.org.uk:22022/tombstones/puppet-httpd.git
-
+#git clone ssh://deploy:/tombstones/puppet-httpd.git
 git clone deploy:/tombstones/puppet-httpd.git
-# git clone deploy:/tombstones/puppet-common.git #This is only here for testing
-
-
-## -- not certain why these are needed, as puppet uses the "deploy" alias to pull things down.
-curl -X POST "https://config.tombstones.org.uk:23000/api/v1/user/keys" \
--H "accept: application/json" \
--H "Content-Type: application/json" \
--H "Authorization: token 2b2182bbbb7e52b3193c4c9718c6e96c372f8156" \
--d "{  \"key\": \"$(cat /root/.ssh/id_rsa.pub)\",  \"read_only\": true,  \"title\": \"$(hostname -s)-postcfg-$(date +'%s')\"}"
-
-# -- php
-#git clone ssh://git@config.tombstones.org.uk:22022/tombstones/puppet-php.git
 
 # -- mariadb
 #git clone ssh://git@config.tombstones.org.uk:22022/tombstones/puppet-mariadb.git
+#git clone deploy:/tombstones/puppet-mariadb.git
 
 # -- postfix
-#git clone ssh://git@config.tombstones.org.uk:22022/tombstones/puppet-postfix.git
+#git clone ssh://git@config.tombstones.org.uk:22022/tombstones/puppet-postfix.git
+#git clone deploy:/tombstones/puppet-postfix.git