Updates to support PHP on current dokku

bin/compile

@@ -239,8 +239,12 @@ function package_newrelic_enabled() {
 
 export_env_dir "$3"
 
+# Create dokku user so volumes can be read/write
+#useradd -b /app/web -s /dev/null -u 1000 -U dokku
+
 # Download jq binary for JSON processing
 export PATH="$HOME/bin:$PATH"
+mkdir -p $HOME/bin
 curl "http://${S3_BUCKET}.s3.amazonaws.com/jq/jq" -L -s -o - > "$HOME/bin/jq"
 chmod +x "$HOME/bin/jq"
 
@@ -261,7 +265,7 @@ PHP_INCLUDES=
 COMPILE_CMD=
 NGINX_INCLUDES=
 NEWRELIC_VERSION=4.4.5.35
-LOG_FILES=( "/app/vendor/nginx/logs/access.log" "/app/vendor/nginx/logs/error.log" "/app/vendor/php/var/log/error.log" )
+LOG_FILES=( "/app/vendor/nginx/logs/access.log" "/app/vendor/nginx/logs/error.log" "/app/vendor/php/var/log/php-error.log" )
 
 # Read config variables from composer.json if it exists
 if [ -f "$BUILD_DIR/composer.json" ]; then
@@ -393,6 +397,11 @@ if [ -n "$FRAMEWORK" ] && [ -f "$FRAMEWORK" ]; then
     LOG_FILES=$(unique_array ${LOG_FILES[@]} ${FRAMEWORK_LOG_FILES[@]})
 fi
 
+# for d in ${LOG_FILES[@]}; do
+#     chown dokku `dirname $d`
+#     chmod 777 `dirname $d`
+# done
+
 if [ -n "$COMPILE_CMD" ]; then
     status "Running compile commands"
     while read -r cmd; do
@@ -430,15 +439,22 @@ export DOCUMENT_ROOT="$DOCUMENT_ROOT"
 export INDEX_DOCUMENT="$INDEX_DOCUMENT"
 export NGINX_INCLUDES="$NGINX_INCLUDES"
 
+if [[ ! -d /app/logs ]]; then
+    mkdir /app/logs
+fi
+chmod 777 -R /app/logs
+find /app/web/uploads -type d -exec chmod 777 {} \;
+find /app/web/tmp -type d -exec chmod 777 {} \;
+
 if [ -n "\$NEW_RELIC_LICENSE_KEY" ]; then
     echo "newrelic.license=\"\$NEW_RELIC_LICENSE_KEY\"" > /app/vendor/php/etc/conf.d/newrelic_license.ini
 fi
 
 erb conf/nginx.conf.erb > /app/vendor/nginx/conf/nginx.conf
 erb conf/site.conf.erb > /app/vendor/nginx/conf/site.conf
 
-`init_log_plex_fifo ${LOG_FILES}`
-`tail_log_plex ${LOG_FILES} ${SYS_LOG_FILES}`
+# `init_log_plex_fifo ${LOG_FILES}`
+# `tail_log_plex ${LOG_FILES} ${SYS_LOG_FILES}`
 
 (
     exec php-fpm -p "/app/vendor/php"

conf/nginx/base.conf.erb

@@ -15,8 +15,12 @@ http {
 
     keepalive_timeout  65;
 
-    error_log logs/error.log notice;
-    access_log logs/access.log;
+    error_log /app/logs/error.log notice;
+    access_log /app/logs/access.log;
+
+    rewrite_log on;
+
+    types_hash_max_size 2048;
 
     client_max_body_size 100m;
     client_body_timeout 600s;
@@ -68,10 +72,10 @@ http {
         #Specify a charset
         charset utf-8;
 
-        include site.conf;
-
         <% Shellwords.split(ENV['NGINX_INCLUDES'].to_s).each do |f| %>
         include /app/<%= f %>;
         <% end %>
+
+        include site.conf;
     }
 }

conf/nginx/default_site.conf.erb

@@ -3,6 +3,8 @@ root /app/<%= ENV['DOCUMENT_ROOT'] %>;
 
 location ~ \.php {
     include fastcgi_params;
+    fastcgi_param SERVER_PORT 80;
+    fastcgi_param SERVER_NAME $http_host;
     fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
     fastcgi_pass php;
     fastcgi_buffers 256 4k;

conf/php/php-fpm.conf

@@ -27,7 +27,7 @@
 ; If it's set to "syslog", log is sent to syslogd instead of being written
 ; in a local file.
 ; Default Value: log/php-fpm.log
-error_log = var/log/error.log
+error_log = /app/logs/php-error.log
 
 ; syslog_facility is used to specify what type of program is logging the
 ; message. This lets syslogd specify that messages from different facilities