4.x nginx

src/Provision/Command/ServicesCommand.php

@@ -99,21 +99,25 @@ public static function getCommandOptions() {
 
         // Load all service options
         $options = Context::getServiceOptions();
-    
+
         // For each service type...
         foreach ($options as $service => $service_name) {
 
-            $class = Service::getClassName($service);
-
-            // Load option_documentation() into input options.
-            foreach (Context::getContextTypeOptions() as $type => $type_name) {
-                $method = "{$type}_options";
-                foreach ($class::$method() as $option => $description) {
-                    $description = "$type_name $service service: $description";
-                    $inputDefinition[] = new InputOption($option, NULL, InputOption::VALUE_OPTIONAL, $description);
+            // Load every available service type.
+            foreach (Context::getServiceTypeOptions($service) as $service_type => $service_name) {
+                $class = Service::getClassName($service, $service_type);
+
+                Provision::getProvision()->getLogger()->debug("Loading options from $class $service_type");
+
+                // Load option_documentation() into input options.
+                foreach (Context::getContextTypeOptions() as $type => $type_name) {
+                    $method = "{$type}_options";
+                    foreach ($class::$method() as $option => $description) {
+                      $description = "$type_name $service $service_name service: $description";
+                      $inputDefinition[] = new InputOption($option, NULL, InputOption::VALUE_OPTIONAL, $description);
+                    }
                 }
             }
-
         }
 
         return $inputDefinition;
@@ -283,12 +287,12 @@ private function askForServiceProperties($service, $service_type = NULL) {
                 $property = Provision::newProperty($property);
             }
 
-            if ($this->context->hasService($service) && $this->context->getService($service)->getProperty($name)) {
+            if ($this->context->hasService($service) && $this->context->getService($service)->hasProperty($name) && $this->context->getService($service)->getProperty($name)) {
                 $property->default = $this->context->getService($service)->getProperty($name);
             }
 
             // If option does not exist, ask for it.
-            if (!empty($this->input->getOption($name))) {
+            if ($this->input->hasOption($name) && !empty($this->input->getOption($name))) {
                 $properties[$name] = $this->input->getOption($name);
                 $this->io->comment("Using option {$name}={$properties[$name]}");
             }

src/Provision/ConfigFile.php

@@ -119,10 +119,16 @@ function __construct($context, $service = NULL, $data = array()) {
    * This is a stub to be implemented by subclasses.
    */
   function process() {
+      $this->data = [];
+
       if (!empty($this->context->getProperties())) {
           $this->data = $this->context->getProperties();
       }
 
+      if (isset($this->service) && !empty($this->service->getProperties())) {
+          $this->data = array_merge($this->data, $this->service->getProperties());
+      }
+
       // @TODO: Remove legacy code.
 //    if (is_object($this->store)) {
 //      $this->data['records'] = array_filter(array_merge($this->store->loaded_records, $this->store->records));

src/Provision/Context/ServerContext.php

@@ -58,6 +58,8 @@ function __construct($name, Provision $provision, array $options = [])
         else {
             $this->server_config_path = $this->getProperty('server_config_path');
         }
+
+        $this->fs = new Filesystem();
     }
 
     /**
@@ -115,4 +117,55 @@ public function verify()
         $tasks = [];
         return $tasks;
     }
+
+    /**
+     * Run a shell command on this server.
+     *
+     * @param $cmd string The command to run
+     * @param $dir string The directory to run the command in. Defaults to this server's config path.
+     * @param $return string What to return. Can be 'output' or 'exit'.
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function shell_exec($command, $dir = NULL, $return = 'output') {
+        $cwd = getcwd();
+        $original_command = $command;
+
+        $tmpdir = sys_get_temp_dir() . '/provision';
+        if (!Provision::fs()->exists($tmpdir)){
+            Provision::fs()->mkdir($tmpdir);
+        }
+
+        $datestamp = date('c');
+        $tmp_output_file = tempnam($tmpdir, 'task.' . $datestamp . '.output.');
+
+        $effective_wd = $dir? $dir:
+            $this->getProperty('server_config_path');
+
+        if ($this->getProvision()->getOutput()->isVerbose()) {
+            $this->getProvision()->io()->commandBlock($command, $effective_wd);
+        }
+
+        // Output and Errors to files.
+        $command .= "> $tmp_output_file 2>&1";
+
+        chdir($effective_wd);
+        exec($command, $output, $exit);
+        chdir($cwd);
+
+        $output = file_get_contents($tmp_output_file);
+
+        if (!empty($output)){
+            if ($this->getProvision()->getOutput()->isVerbose()) {
+                $this->getProvision()->io()->outputBlock($output);
+            }
+        }
+
+        if ($exit != ResultData::EXITCODE_OK) {
+            throw new \Exception($output);
+        }
+
+        return ${$return};
+    }
 }

src/Provision/Service.php

@@ -203,12 +203,13 @@ protected function writeConfigurations(Context $context = NULL)
                 );
             }
             catch (\Exception $e) {
-                $context->getProvision()->getLogger()->info(
-                    'Unable to write {description} to {path}.', [
-                        'description' => $config->description,
-                        'path' => $config->filename(),
+                throw new \Exception(strtr(
+                    'Unable to write {description} to {path}: {message}', [
+                        '{description}' => $config->description,
+                        '{path}' => $config->filename(),
+                        '{message}' => $e->getMessage(),
                     ]
-                );
+                ));
                 $success = FALSE;
             }
         }
@@ -243,6 +244,29 @@ public function getName()
         return $this::SERVICE;
     }
 
+    /**
+     * Return all properties for this context.
+     *
+     * @return array
+     */
+    public function getProperties() {
+        return $this->properties;
+    }
+
+    /**
+     * Whether or not this Services has a property.
+     *
+     * @param $type
+     * @return bool
+     */
+    public function hasProperty($name) {
+        if (isset($this->properties[$name])) {
+            return TRUE;
+        }
+        else {
+            return FALSE;
+        }
+    }
 
     /**
      * Get a specific property.

src/Provision/Service/Http/Apache/Configuration/SiteConfigFile.php

@@ -48,6 +48,10 @@ function process() {
       $extra_apache_configs = $this->getContext()->servicesInvoke('extraApacheConfig', [$this]);
       $this->data['extra_config'] = implode("\n", $extra_apache_configs);
 
+      $this->data['aliases'] = [];
+      $this->data['redirection'] = FALSE;
+      $this->data['ssl_redirection'] = FALSE;
+
 //    if ($this->aliases && !is_array($this->aliases)) {
 //      $this->aliases = explode(",", $this->aliases);
 //    }