Release: emergence v1.1.5

.dockerignore

@@ -4,4 +4,5 @@
 .npmignore
 cloud-config.yaml
 Dockerfile
-run-dev-container
+run-dev-container
+build-docker-image

Dockerfile

@@ -83,11 +83,16 @@ COPY . /src
 RUN npm install -g /src
 
 
+# link certbot renewal hook to reload nginx
+RUN mkdir -p /etc/letsencrypt/renewal-hooks/deploy \
+    && ln -s /src/bin/reload-nginx /etc/letsencrypt/renewal-hooks/deploy/01-reload-nginx
+
+
 # setup and expose emergence
 RUN mkdir -p /emergence
 EXPOSE 22 80 3306 9083
 ENV MYSQL_HOME=/emergence/services/etc
-VOLUME ["/emergence"]
+VOLUME ["/emergence", "/etc/letsencrypt"]
 
 
 # setup entrypoint

bin/reload-nginx

@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+/usr/sbin/nginx -c /emergence/services/etc/nginx.conf -s reload

bin/resolve-site

@@ -28,6 +28,8 @@ UNDERSCORE="$DIR/../node_modules/.bin/underscore"
 # search sites
 pushd /emergence/sites > /dev/null
 for SITE_DIR in `find . -maxdepth 1 ! -path . -type d`; do
+    [ -f "${SITE_DIR}/site.json" ] || continue
+
     SITE_HANDLE="$(basename ${SITE_DIR})"
     SITE_HOSTNAMES="$(sudo cat ${SITE_DIR}/site.json | $UNDERSCORE process '(data.hostnames||[]).concat([data.primary_hostname]).filter(x=>x)' --outfmt text)"
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "emergence",
   "preferGlobal": true,
-  "version": "1.1.3",
+  "version": "1.1.5",
   "license": "MIT",
   "dependencies": {
     "hostile": "^1.3.x",

php-bootstrap/lib/DB.class.php

@@ -494,9 +494,19 @@ public static function syncTimezone()
             return;
         }
 
+        $timezoneTestResult = DB::oneValue('SELECT CONVERT_TZ("2007-03-11 3:00:00", "US/Eastern", "US/Central")');
+
+        if ($timezoneTestResult == '2007-03-11 01:00:00') {
+            // MySQL server support named timezones
+            $mysqlTimezone = date_default_timezone_get();
+        } else {
+            // use static timezone offset because MySQL doesn't have timezone tables loaded
+            $mysqlTimezone = date('P');
+        }
+
         self::nonQuery(
             'SET time_zone = "%s"',
-            self::escape(date('P'))
+            self::escape($mysqlTimezone)
         );
     }
 

php-bootstrap/lib/Emergence_FS.class.php

@@ -688,7 +688,7 @@ public static function findFiles($filename, $useRegexp = false, $scope = null, $
         }
 
         $fileResults = DB::query(
-            'SELECT f2.* FROM (SELECT MAX(f1.ID) AS ID FROM `%1$s` f1 WHERE CollectionID IN (%2$s) AND Status != "Phantom" GROUP BY f1.Handle) AS lastestFiles LEFT JOIN `%1$s` f2 ON (f2.ID = lastestFiles.ID) WHERE f2.Status != "Deleted" AND f2.Handle %3$s "%4$s"'
+            'SELECT f2.* FROM (SELECT MAX(f1.ID) AS ID FROM `%1$s` f1 WHERE CollectionID IN (%2$s) AND Status != "Phantom" GROUP BY f1.CollectionID, f1.Handle) AS lastestFiles LEFT JOIN `%1$s` f2 ON (f2.ID = lastestFiles.ID) WHERE f2.Status != "Deleted" AND f2.Handle %3$s "%4$s"'
             ,array(
                 SiteFile::$tableName
                 ,$collectionsQuery

php-bootstrap/lib/Site.class.php

@@ -325,12 +325,20 @@ public static function getRequestPathResult($path)
     public static function executeScript(SiteFile $_SCRIPT_NODE, $_SCRIPT_EXIT = true)
     {
         // create session
-        if (
-            empty($GLOBALS['Session']) &&
-            static::$autoCreateSession &&
-            !in_array(implode('/', static::$resolvedPath), static::$skipSessionPaths)
-        ) {
-            $GLOBALS['Session'] = UserSession::getFromRequest();
+        if (empty($GLOBALS['Session']) && static::$autoCreateSession) {
+            $resolvedPath = implode('/', static::$resolvedPath) . '/';
+
+            $createSession = true;
+            foreach (static::$skipSessionPaths as $skipSessionPath) {
+                if (strpos($resolvedPath, $skipSessionPath) === 0) {
+                    $createSession = false;
+                    break;
+                }
+            }
+
+            if ($createSession) {
+                $GLOBALS['Session'] = UserSession::getFromRequest();
+            }
         }
 
         if (extension_loaded('newrelic')) {