Working deployment deployment and deployment

I put some deployment in your deployment so you could deploy while
deploying

.gitignore

@@ -8,4 +8,4 @@ vendor
 DigitalOcean/config.php
 DigitalOcean/vendor
 composer.phar
-.release-config.php
+deploy-config.php

DigitalOcean/create-server.php

@@ -136,19 +136,22 @@
 echo "image: {$droplet->image->name} - {$droplet->image->slug}\n";
 echo "size: {$droplet->size->slug} cpu({$droplet->size->vcpus}) memory({$droplet->size->memory}) disk({$droplet->size->disk})\n";
 
-if (!empty($argv[1]))
+if (!empty($argv[1]) && $argv[1] == 'go')
 {
     $baseDir = realpath(__DIR__.'/../');
 
-    // if we are in a real shell we could do this in one pipe, or maybe use rsync
-    //  but lets use a temp file instead so we work in the shell that github ships
-	echo "Bootstrapping server\n";
+    echo "Bootstrapping server\n";
 
     chdir($baseDir);
-    runCommand("scp ./DigitalOcean/setup.sh root@$serverIp:");
-    runCommand("scp ./DigitalOcean/run-puppet.sh root@$serverIp:");
+
+    // if we are in a real shell we could do this in one pipe, or maybe use rsync
+    //  but lets use a temp file instead so we work in the shell that github ships
     runCommand("tar cf puphpet.tar puphpet");
     runCommand("scp puphpet.tar root@$serverIp:/tmp/puphpet.tar");
+    runCommand("tar cf puphpet-user.tar puphpet-user");
+    runCommand("scp puphpet-user.tar root@$serverIp:/tmp/puphpet-user.tar");
+
+    runCommand("scp ./DigitalOcean/setup.sh root@$serverIp:");
     runCommand("ssh root@$serverIp 'sh -c /root/setup.sh'");
 }
 

DigitalOcean/setup.sh

@@ -2,6 +2,7 @@
 mkdir /vagrant/
 cd /vagrant/
 tar xvf /tmp/puphpet.tar
+tar xvf /tmp/puphpet-user.tar
 cd /vagrant/puphpet
 ./shell/initial-setup.sh /vagrant/puphpet
 ./shell/install-ruby.sh /vagrant/puphpet
@@ -11,3 +12,6 @@ mkdir -p /etc/facter/facts.d
 echo '{"vm_target_key":"digital_ocean"}' > /etc/facter/facts.d/info.json
 cd /vagrant/puphpet/puppet
 puppet apply manifest.pp --verbose --hiera_config /vagrant/puphpet/puppet/hiera.yaml --parser future --modulepath=/vagrant/puphpet/puppet/modules
+cd /vagrant/puphpet
+rsync -ra /vagrant/puphpet-user/exec-always/. /vagrant/puphpet/files/exec-always/
+./shell/execute-files.sh exec-once exec-always