MatomoInstall: temporary plug to the core

matomo-org · Mar 13, 2020 · 5bb4565 · 5bb4565
1 parent a391f00
commit 5bb4565
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/core/Application/Kernel/EnvironmentValidator.php b/core/Application/Kernel/EnvironmentValidator.php
@@ -11,6 +11,7 @@
 use Piwik\Common;
 use Piwik\Exception\NotYetInstalledException;
 use Piwik\Filechecks;
+use Piwik\MatomoInstaller;
 use Piwik\Piwik;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
@@ -59,6 +60,9 @@ public function validate()
             $startInstaller = false;
         }
 
+        if (MatomoInstaller::isHeadlessInstall())
+            MatomoInstaller::installFromConfig();
+
         // Start the installation when config file not found
         $this->checkConfigFileExists($this->settingsProvider->getPathLocal(), $startInstaller);
 

diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
@@ -11,6 +11,7 @@
 use Exception;
 use Piwik\Cache as PiwikCache;
 use Piwik\Container\StaticContainer;
+use Piwik\MatomoInstaller;
 
 /**
  * Contains helper methods that can be used to get common Piwik settings.
@@ -220,6 +221,8 @@ public static function getPiwikUrl()
      */
     public static function isMatomoInstalled()
     {
+        if (MatomoInstaller::isHeadlessInstall())
+            return false;
         $config = Config::getInstance()->getLocalPath();
         $exists = file_exists($config);