.gitignore

@@ -26,3 +26,5 @@ node_modules
 !/.travis.yml
 coverage
 !/.gitlab
+composer.phar
+settings.php-*.bak

Controllers/Cli/Install.php

@@ -64,7 +64,8 @@ class Install extends Cli\Controller implements Interfaces\CliControllerInterfac
                 if ($installType == "all" || $installType == "cassandra") {
                     $this->out('- Provisioning Cassandra:', $this::OUTPUT_INLINE);
                     $isCleanCassandra = $this->getopt("cleanCassandra") != null;
-                    $provisioner->provisionCassandra(null, $isCleanCassandra);
+                    $exitOnFailure = (bool) $this->getopt("exitOnFailure");
+                    $provisioner->provisionCassandra(null, $isCleanCassandra, $exitOnFailure);
                     $this->out('OK');
 
                     $this->out('- Emptying Cassandra pool:', $this::OUTPUT_INLINE);
@@ -85,7 +86,7 @@ class Install extends Cli\Controller implements Interfaces\CliControllerInterfac
                     $provisioner->setupFirstAdmin();
                     $this->out('OK');
                 } catch (\Exception $ex) {
-                    $this->out('Could not setup initial user');
+                    $this->out("Could not setup initial user: {$ex->getMessage()}");
                 }
             }
 

Core/Provisioner/Installer.php

@@ -237,10 +237,11 @@ class Installer
 
     public function provisionCassandra(
         Provisioners\ProvisionerInterface $cassandraStorage = null,
-        $cleanData = false
+        $cleanData = false,
+        $exitOnFailure = false
     ) {
         $cassandraStorage = $cassandraStorage ?: new Provisioners\CassandraProvisioner();
-        $cassandraStorage->provision($cleanData);
+        $cassandraStorage->provision($cleanData, $exitOnFailure);
     }
 
     public function reloadStorage()

Core/Provisioner/Provisioners/CassandraProvisioner.php

@@ -18,7 +18,7 @@ class CassandraProvisioner implements ProvisionerInterface
         $this->client = $client ?: null; // Should be created on-the-fly at provision()
     }
 
-    public function provision(bool $cleanData)
+    public function provision(bool $cleanData, bool $exitOnFailure = false)
     {
         // TODO: Add cleanData to provisioner.
         $config = $this->config->get('cassandra');
@@ -39,6 +39,9 @@ class CassandraProvisioner implements ProvisionerInterface
             }
         } catch (\Exception $e) {
             error_log("Error provisioning cassandra: " . $e->getMessage());
+            if ($exitOnFailure) {
+                exit(1);
+            }
         }
  
         return true;

Core/Provisioner/Provisioners/ProvisionerInterface.php

@@ -5,5 +5,5 @@ use Minds\Core\Provisioner\Tasks\TaskInterface;
 
 interface ProvisionerInterface
 {
-    public function provision(bool $cleanData);
+    public function provision(bool $cleanData, bool $exitOnFailure);
 }

Core/Provisioner/Provisioners/cassandra-provision.cql

@@ -1545,6 +1545,7 @@ CREATE TABLE minds.experiments (
     AND min_index_interval = 128
     AND read_repair_chance = 0.0
     AND speculative_retry = '99PERCENTILE';
+
 CREATE INDEX experiments_key_idx ON minds.experiments (key);
 
 ALTER TABLE minds.withdrawals ADD (status text, address text, gas varint);

composer.json

@@ -10,7 +10,7 @@
         "firebase/php-jwt": "^3.0",
         "kramnorth/cinemr-php-sdk": "dev-master@dev",
         "kickbox/kickbox": "*",
-        "Minds/Surge": "dev-master@dev",
+        "minds/surge": "dev-master@dev",
         "minds/mw3": "dev-master@dev",
         "phpmailer/phpmailer": "~5.2",
         "stripe/stripe-php": "^6.43",
@@ -43,7 +43,7 @@
     "repositories": [
         {
             "type": "vcs",
-            "url": "https://bc220f12a84437201d2bc003c3afe0b543040b36@github.com/minds/Surge.git"
+            "url": "https://bc220f12a84437201d2bc003c3afe0b543040b36@github.com/minds/surge.git"
         },
         {
             "type": "vcs",

composer.lock

@@ -7,11 +7,11 @@
     "content-hash": "8d780cdee45441b9106ff5986f7afbd0",
     "packages": [
         {
-            "name": "Minds/Surge",
+            "name": "minds/surge",
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://bc220f12a84437201d2bc003c3afe0b543040b36@github.com/minds/Surge.git",
+                "url": "https://bc220f12a84437201d2bc003c3afe0b543040b36@github.com/minds/surge.git",
                 "reference": "28efecd8e6518869aca8e0357cdb869e82caf6d4"
             },
             "type": "library",

containers/installer/install.sh

 #!/bin/sh
 
+# Exit script wit ERRORLEVEL if any command fails
+set -e
+
 echo "INSTALLING MINDS"
 
 cd /var/www/Minds/engine
@@ -18,4 +21,5 @@ php /var/www/Minds/engine/cli.php install \
     --email-public-key=/.dev/minds.pub \
     --phone-number-private-key=/.dev/minds.pem \
     --phone-number-public-key=/.dev/minds.pub \
-    --cassandra-server=cassandra
+    --cassandra-server=cassandra \
+    --exitOnFailure=1

containers/php-fpm/php-fpm.dev.conf

 [www]
-
 user = www-data
 group = www-data
 
 listen = 127.0.0.1:9000
 listen.backlog = -1
 
-
-pm = static
-pm.max_children = 4
-pm.max_requests = 10000
+pm = ondemand
+pm.max_children = 75
+pm.process_idle_timeout = 10s
+pm.max_requests = 100
 pm.status_path = /status
 
 chdir = /
-
 catch_workers_output = yes
-
 slowlog = /dev/stderr
 request_slowlog_timeout = 10s
-
 request_terminate_timeout = 120s
-
 rlimit_files = 65535
+
 env[MINDS_VERSION] = $MINDS_VERSION
 env[MINDS_ENV] = $MINDS_ENV
 env[SENTRY_DSN] = $SENTRY_DSN

containers/phpspec/Dockerfile

+FROM minds/php:7.3
+
+WORKDIR /var/www/Minds/engine
+
+COPY ./containers/phpspec/phpspec.sh /var/www/Minds/phpspec.sh
+
+ENTRYPOINT [ "../phpspec.sh" ]
+CMD ["run", "--format=pretty", "--no-code-generation"]

containers/phpspec/phpspec.sh

+#!/bin/sh
+set -e
+
+cd /var/www/Minds/engine
+php -n -c Spec/php-test.ini bin/phpspec $@

settings.example.php

@@ -143,7 +143,7 @@ $CONFIG->__site_secret__ = '{{site-secret}}';
 // $CONFIG->cdn_url = 'http://{{domain}}/';
 $CONFIG->site_url = 'http://{{domain}}/';
 $CONFIG->cdn_url = 'http://{{domain}}/';
-$CONFIG->cdn_assets_url = 'http://{{domain}}/en/';
+$CONFIG->cdn_assets_url = 'http://{{domain}}/';
 $CONFIG->zmq_server = 'localhost';
 $CONFIG->checkout_url = 'http://{{checkout_domain}}/';
 

tools/setup.sh

 #!/bin/sh
 
+# Exit script wit ERRORLEVEL if any command fails
+set -e
+
 INSTALLOPTS=""
 if [ "$1" == "production" ]; then
   INSTALLOPTS="-a"
@@ -10,11 +13,12 @@ rm -rf ../vendor
 
 # Setup composer
 php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-php -r "if (hash_file('SHA384', 'composer-setup.php') === 'c5b9b6d368201a9db6f74e2611495f369991b72d9c8cbd3ffbc63edff210eb73d46ffbfce88669ad33695ef77dc76976') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+php -r "if (hash_file('SHA384', 'composer-setup.php') === 'e0012edf3e80b6978849f5eff0d4b4e4c79ff1609dd1e613307e16318854d24ae64f26d17af3ef0bf7cfb710ca74755a') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 php composer-setup.php
 php -r "unlink('composer-setup.php');"
 
 # Optimise for package install speed
-composer.phar -n global require -n "hirak/prestissimo"
+php composer.phar -n global require -n "hirak/prestissimo"
+
 # Grab dependencies
 php composer.phar install $INSTALLOPTS --ignore-platform-reqs