Merge pull request #41 from gerhard/php-strategy

Deliver PHP code (or just a static site) to a shared environment.

CHANGELOG.md

@@ -1,3 +1,8 @@
+### What's new in deliver 0.7.0
+
+* **shared** strategy with file permissions support (think www-data,
+  php-fpm, etc.)
+
 ### What's new in deliver 0.6.0
 
 * **generated** strategy with built-in support for ROCCO. Other

libexec/common

@@ -117,7 +117,7 @@ git_submodules() {
         touch ~/.ssh/known_hosts
       fi
       cat .gitmodules | awk -F '://|@|:|/' '
-      /url/ {
+      /url =/ {
         command=\"test \$(ssh-keygen -F \" \$2 \" | grep -c found) = 0 && ssh-keyscan \" \$2 \" >> ~/.ssh/known_hosts $SILENCE\"
         system(command)
         close(command)
@@ -236,3 +236,16 @@ upstart() {
   launch
   __exec_if_defined "post_upstart"
 }
+
+permissions() {
+  __exec_if_defined "pre_permissions"
+
+  status "Setting file permissions"
+  __remote "
+    [ -n \"$OWNER\" ] && sudo chown -fR $OWNER.$GROUP $DELIVER_TO
+    [ -n \"$PERMISSIONS\" ] && sudo chmod -fR $PERMISSIONS $DELIVER_TO
+    exit 0
+  " "$HOSTS"
+
+  __exec_if_defined "post_permissions"
+}

libexec/defaults

@@ -14,14 +14,10 @@ GIT_REMOTE="deliver"
 
 SSH_TIMEOUT=3
 
-# Sincer deliver leverages foreman,
-# it supports all the supervisors that foreman does
-SUPERVISOR="upstart"
-
 AUTHORIZED_REMOTE_HOSTS=()
 
 REQUIRED_CONFIGS=("ORIGIN_DIR" "STRATEGY")
-OPTIONAL_CONFIGS=("APP" "APP_USER" "DELIVER_TO" "BRANCH" "SUPERVISOR" "FOREMAN_EXTRAS" "PORT" "AUTHORIZED_REMOTE_HOSTS")
+OPTIONAL_CONFIGS=("APP" "APP_USER" "DELIVER_TO" "BRANCH" "FOREMAN_EXTRAS" "PORT" "AUTHORIZED_REMOTE_HOSTS")
 
 MODE="compact"
 

strategies/nodejs

@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
 
 REQUIRED_CONFIGS+=("HOSTS")
+OPTIONAL_CONFIGS+=("SUPERVISOR")
+
+# Sincer deliver leverages foreman,
+# it supports all the supervisors that foreman does
+if [ -z "$SUPERVISOR" ]
+then
+  SUPERVISOR="upstart"
+fi
 
 run() {
   authorize_hosts

strategies/ruby

@@ -4,6 +4,14 @@
 # It uses git push, rvm & foreman to generate upstart jobs
 
 REQUIRED_CONFIGS+=("HOSTS")
+OPTIONAL_CONFIGS+=("SUPERVISOR")
+
+# Sincer deliver leverages foreman,
+# it supports all the supervisors that foreman does
+if [ -z "$SUPERVISOR" ]
+then
+  SUPERVISOR="upstart"
+fi
 
 # This function must be present since deliver will call it directly
 # Everything inside it or around it are only limited by your imagination : )

strategies/shared

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+REQUIRED_CONFIGS+=("HOSTS")
+OPTIONAL_CONFIGS+=("OWNER" "GROUP" "PERMISSIONS")
+
+run() {
+  authorize_hosts
+  init_app_remotely
+  git_push
+  git_reset_remote
+  authorize_remote_hosts
+  git_submodules
+  permissions
+}