l3xx
diff --git a/‎.gitattributes
+24 b/‎.gitattributes
+24
diff --git a/‎app/AppKernel.php
-34 b/‎app/AppKernel.php
-34
diff --git a/‎app/config/routing.yml
-124 b/‎app/config/routing.yml
-124
diff --git a/‎archive/Vagrantfile
+17 b/‎archive/Vagrantfile
+17
diff --git a/‎archive/puphpet/config.yaml
-1 b/‎archive/puphpet/config.yaml
-1
diff --git a/‎archive/puphpet/puppet/nodes/Firewall.pp
+1-1 b/‎archive/puphpet/puppet/nodes/Firewall.pp
+1-1
diff --git a/‎archive/puphpet/puppet/nodes/Nginx.pp
+71-5 b/‎archive/puphpet/puppet/nodes/Nginx.pp
+71-5
diff --git a/‎src/Puphpet/Extension/VagrantfileAwsBundle/Resources/views/Vagrantfile.rb.twig renamed to ‎archive/puphpet/vagrant/Vagrantfile-aws
-16 b/‎src/Puphpet/Extension/VagrantfileAwsBundle/Resources/views/Vagrantfile.rb.twig renamed to ‎archive/puphpet/vagrant/Vagrantfile-aws
-16
@@ -0,0 +1,24 @@
+* text=auto
+
+*.css       text
+*.dist      text
+*.js        text
+*.json      text
+*.lock      text
+*.md        text
+*.php       text
+*.pp        text
+Puppetfile  text
+*.rb        text
+*.sh        text
+*.txt       text
+*.twig      text
+Vagrantfile text
+*.yaml      text
+*.yml       text
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.gif binary
+*.jpg binary
+*.png binary
@@ -15,40 +15,6 @@ public function registerBundles()
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Puphpet\MainBundle\PuphpetMainBundle(),
             new Cocur\Slugify\Bridge\Symfony\CocurSlugifyBundle(),
-
-            new Puphpet\Extension\VagrantfileLocalBundle\PuphpetExtensionVagrantfileLocalBundle(),
-            new Puphpet\Extension\VagrantfileRackspaceBundle\PuphpetExtensionVagrantfileRackspaceBundle(),
-            new Puphpet\Extension\VagrantfileLinodeBundle\PuphpetExtensionVagrantfileLinodeBundle(),
-            new Puphpet\Extension\VagrantfileSoftlayerBundle\PuphpetExtensionVagrantfileSoftlayerBundle(),
-            new Puphpet\Extension\VagrantfileAwsBundle\PuphpetExtensionVagrantfileAwsBundle(),
-            new Puphpet\Extension\VagrantfileGceBundle\PuphpetExtensionVagrantfileGceBundle(),
-            new Puphpet\Extension\VagrantfileDigitalOceanBundle\PuphpetExtensionVagrantfileDigitalOceanBundle(),
-            new Puphpet\Extension\VagrantfileIkoulaCloudBundle\PuphpetExtensionVagrantfileIkoulaCloudBundle(),
-            new Puphpet\Extension\PackageBundle\PuphpetExtensionPackageBundle(),
-            new Puphpet\Extension\UserGroupBundle\PuphpetExtensionUserGroupBundle(),
-            new Puphpet\Extension\CronBundle\PuphpetExtensionCronBundle(),
-            new Puphpet\Extension\ApacheBundle\PuphpetExtensionApacheBundle(),
-            new Puphpet\Extension\NginxBundle\PuphpetExtensionNginxBundle(),
-            new Puphpet\Extension\PhpBundle\PuphpetExtensionPhpBundle(),
-            new Puphpet\Extension\WPCliBundle\PuphpetExtensionWPCliBundle(),
-            new Puphpet\Extension\DrushBundle\PuphpetExtensionDrushBundle(),
-            new Puphpet\Extension\XdebugBundle\PuphpetExtensionXdebugBundle(),
-            new Puphpet\Extension\XhprofBundle\PuphpetExtensionXhprofBundle(),
-            new Puphpet\Extension\MysqlBundle\PuphpetExtensionMysqlBundle(),
-            new Puphpet\Extension\PostgresqlBundle\PuphpetExtensionPostgresqlBundle(),
-            new Puphpet\Extension\BeanstalkdBundle\PuphpetExtensionBeanstalkdBundle(),
-            new Puphpet\Extension\MongoDbBundle\PuphpetExtensionMongoDbBundle(),
-            new Puphpet\Extension\ElasticSearchBundle\PuphpetExtensionElasticSearchBundle(),
-            new Puphpet\Extension\MailCatcherBundle\PuphpetExtensionMailCatcherBundle(),
-            new Puphpet\Extension\RabbitMQBundle\PuphpetExtensionRabbitMQBundle(),
-            new Puphpet\Extension\HhvmBundle\PuphpetExtensionHhvmBundle(),
-            new Puphpet\Extension\RedisBundle\PuphpetExtensionRedisBundle(),
-            new Puphpet\Extension\SqliteBundle\PuphpetExtensionSqliteBundle(),
-            new Puphpet\Extension\FirewallBundle\PuphpetExtensionFirewallBundle(),
-            new Puphpet\Extension\RubyBundle\PuphpetExtensionRubyBundle(),
-            new Puphpet\Extension\NodeJsBundle\PuphpetExtensionNodeJsBundle(),
-            new Puphpet\Extension\PythonBundle\PuphpetExtensionPythonBundle(),
-            new Puphpet\Extension\SolrBundle\PuphpetExtensionSolrBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
 
@@ -1,127 +1,3 @@
 puphpet.main:
     resource: "@PuphpetMainBundle/Resources/config/routing.yml"
     prefix:   /
-
-puphpet.extension.vagrantfilelocal:
-    resource: "@PuphpetExtensionVagrantfileLocalBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/local
-
-puphpet.extension.vagrantfile.rackspace:
-    resource: "@PuphpetExtensionVagrantfileRackspaceBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/rackspace
-
-puphpet.extension.vagrantfile.linode:
-    resource: "@PuphpetExtensionVagrantfileLinodeBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/linode
-
-puphpet.extension.vagrantfile.softlayer:
-    resource: "@PuphpetExtensionVagrantfileSoftlayerBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/softlayer
-
-puphpet.extension.vagrantfile.aws:
-    resource: "@PuphpetExtensionVagrantfileAwsBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/aws
-
-puphpet.extension.vagrantfile.gce:
-    resource: "@PuphpetExtensionVagrantfileGceBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/gce
-
-puphpet.extension.vagrantfile.ikoulacloud:
-    resource: "@PuphpetExtensionVagrantfileIkoulaCloudBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/ikoula-cloud
-
-puphpet.extension.vagrantfile.digital_ocean:
-    resource: "@PuphpetExtensionVagrantfileDigitalOceanBundle/Resources/config/routing.yml"
-    prefix:   /extension/vagrantfile/digitalocean
-
-puphpet.extension.package:
-    resource: "@PuphpetExtensionPackageBundle/Resources/config/routing.yml"
-    prefix:   /extension/package
-
-puphpet.extension.user_group:
-    resource: "@PuphpetExtensionUserGroupBundle/Resources/config/routing.yml"
-    prefix:   /extension/user-group
-
-puphpet.extension.cron:
-    resource: "@PuphpetExtensionCronBundle/Resources/config/routing.yml"
-    prefix:   /extension/cron
-
-puphpet.extension.apache:
-    resource: "@PuphpetExtensionApacheBundle/Resources/config/routing.yml"
-    prefix:   /extension/apache
-
-puphpet.extension.nginx:
-    resource: "@PuphpetExtensionNginxBundle/Resources/config/routing.yml"
-    prefix:   /extension/nginx
-
-puphpet.extension.php:
-    resource: "@PuphpetExtensionPhpBundle/Resources/config/routing.yml"
-    prefix:   /extension/php
-
-puphpet.extension.hhvm:
-    resource: "@PuphpetExtensionHhvmBundle/Resources/config/routing.yml"
-    prefix:   /extension/hhvm
-
-puphpet.extension.xdebug:
-    resource: "@PuphpetExtensionXdebugBundle/Resources/config/routing.yml"
-    prefix:   /extension/xdebug
-
-puphpet.extension.xhprof:
-    resource: "@PuphpetExtensionXhprofBundle/Resources/config/routing.yml"
-    prefix:   /extension/xhprof
-
-puphpet.extension.wpcli:
-    resource: "@PuphpetExtensionWPCliBundle/Resources/config/routing.yml"
-    prefix:   /extension/wpcli
-
-puphpet.extension.mysql:
-    resource: "@PuphpetExtensionMysqlBundle/Resources/config/routing.yml"
-    prefix:   /extension/mysql
-
-puphpet.extension.postgresql:
-    resource: "@PuphpetExtensionPostgresqlBundle/Resources/config/routing.yml"
-    prefix:   /extension/postgresql
-
-puphpet.extension.mongodb:
-    resource: "@PuphpetExtensionMongoDbBundle/Resources/config/routing.yml"
-    prefix:   /extension/mongodb
-
-puphpet.extension.beanstalkd:
-    resource: "@PuphpetExtensionBeanstalkdBundle/Resources/config/routing.yml"
-    prefix:   /extension/beanstalkd
-
-puphpet.extension.rabbitmq:
-    resource: "@PuphpetExtensionRabbitMQBundle/Resources/config/routing.yml"
-    prefix:   /extension/rabbitmq
-
-puphpet.extension.elastic-search:
-    resource: "@PuphpetExtensionElasticSearchBundle/Resources/config/routing.yml"
-    prefix:   /extension/elastic-search
-
-puphpet.extension.mailcatcher:
-    resource: "@PuphpetExtensionMailCatcherBundle/Resources/config/routing.yml"
-    prefix:   /extension/mailcatcher
-
-puphpet.extension.redis:
-    resource: "@PuphpetExtensionRedisBundle/Resources/config/routing.yml"
-    prefix:   /extension/redis
-
-puphpet.extension.sqlite:
-    resource: "@PuphpetExtensionSqliteBundle/Resources/config/routing.yml"
-    prefix:   /extension/sqlite
-
-puphpet.extension.firewall:
-    resource: "@PuphpetExtensionFirewallBundle/Resources/config/routing.yml"
-    prefix:   /extension/firewall
-
-puphpet.extension.ruby:
-    resource: "@PuphpetExtensionRubyBundle/Resources/config/routing.yml"
-    prefix:   /extension/ruby
-
-puphpet.extension.nodejs:
-    resource: "@PuphpetExtensionNodeJsBundle/Resources/config/routing.yml"
-    prefix:   /extension/nodejs
-
-puphpet.extension.python:
-    resource: "@PuphpetExtensionPythonBundle/Resources/config/routing.yml"
-    prefix:   /extension/python
@@ -0,0 +1,17 @@
+dir = File.dirname(File.expand_path(__FILE__))
+
+require 'yaml'
+require "#{dir}/puphpet/ruby/deep_merge.rb"
+
+configValues = YAML.load_file("#{dir}/puphpet/config.yaml")
+
+if File.file?("#{dir}/puphpet/config-custom.yaml")
+  custom = YAML.load_file("#{dir}/puphpet/config-custom.yaml")
+  configValues.deep_merge!(custom)
+end
+
+data = configValues['vagrantfile']
+
+Vagrant.require_version '>= 1.6.0'
+
+eval File.read("#{dir}/puphpet/vagrant/Vagrantfile-#{data['target']}")
@@ -1 +0,0 @@
----
@@ -1,5 +1,5 @@
 if $firewall_values == undef { $firewall_values = hiera_hash('firewall', false) }
-if $vm_values == undef { $vm_values = hiera_hash($::vm_target_key, false) }
+if $vm_values == undef { $vm_values = hiera_hash('vagrantfile', false) }
 
 include puphpet::params
 
 
@@ -68,6 +68,59 @@
     }
   }
 
+  $nginx_proxies = array_true($proxy, 'proxies') ? {
+    true    => $proxy['proxies'],
+    default => [],
+  }
+
+  each( $nginx_proxies ) |$key, $proxy| {
+    $proxy_redirect = array_true($proxy, 'proxy_redirect') ? {
+      true    => $proxy['proxy_redirect'],
+      default => undef,
+    }
+    $proxy_read_timeout = array_true($proxy, 'proxy_read_timeout') ? {
+      true    => $proxy['proxy_read_timeout'],
+      default => $nginx::config::proxy_read_timeout,
+    }
+    $proxy_connect_timeout = array_true($proxy, 'proxy_connect_timeout') ? {
+      true    => $proxy['proxy_connect_timeout'],
+      default => $nginx::config::proxy_connect_timeout,
+    }
+    $proxy_set_header = array_true($proxy, 'proxy_set_header') ? {
+      true    => $proxy['proxy_set_header'],
+      default => [],
+    }
+    $proxy_cache = array_true($proxy, 'proxy_cache') ? {
+      true    => $proxy['proxy_cache'],
+      default => false,
+    }
+    $proxy_cache_valid = array_true($proxy, 'proxy_cache_valid') ? {
+      true    => $proxy['proxy_cache_valid'],
+      default => false,
+    }
+    $proxy_method = array_true($proxy, 'proxy_method') ? {
+      true    => $proxy['proxy_method'],
+      default => undef,
+    }
+    $proxy_set_body = array_true($proxy, 'proxy_set_body') ? {
+      true    => $proxy['proxy_set_body'],
+      default => undef,
+    }
+
+    $proxy_merged = merge($proxy, {
+      'proxy_redirect'        => $proxy_redirect,
+      'proxy_read_timeout'    => $proxy_read_timeout,
+      'proxy_connect_timeout' => $proxy_connect_timeout,
+      'proxy_set_header'      => $proxy_set_header,
+      'proxy_cache'           => $proxy_cache,
+      'proxy_cache_valid'     => $proxy_cache_valid,
+      'proxy_method'          => $proxy_method,
+      'proxy_set_body'        => $proxy_set_body,
+    })
+
+    create_resources(nginx::resource::vhost, { "${key}" => $proxy_merged })
+  }
+
   # Creates a default vhost entry if user chose to do so
   if hash_key_equals($nginx_values['settings'], 'default_vhost', 1) {
     $nginx_vhosts = merge($nginx_values['vhosts'], {
@@ -85,6 +138,7 @@
         'locations'            => [
           {
             'location'              => '/',
+            'autoindex'             => 'off',
             'try_files'             => ['$uri', '$uri/', 'index.php',],
             'fastcgi'               => '',
             'fastcgi_index'         => '',
@@ -94,6 +148,7 @@
           },
           {
             'location'              => '~ \.php$',
+            'autoindex'             => 'off',
             'try_files'             => [
               '$uri', '$uri/', 'index.php', '/index.php$is_args$args'
             ],
@@ -161,9 +216,9 @@
       true    => $vhost['ssl_port'],
       default => '443',
     }
-    $rewrite_to_https = array_true($vhost, 'rewrite_to_https') ? {
+    $rewrite_to_https = $ssl and array_true($vhost, 'rewrite_to_https') ? {
       true    => true,
-      default => false,
+      default => undef,
     }
 
     $vhost_cfg_append = deep_merge(
@@ -191,26 +246,37 @@
     }
 
     each( $nginx_locations ) |$lkey, $location| {
+      if $location['autoindex'] or $location['autoindex'] == 'on' {
+        $autoindex = 'on'
+      } else {
+        $autoindex = 'off'
+      }
+
       # remove empty values
       $location_trimmed = merge({
         'fast_cgi_params_extra' => [],
       }, delete_values($location, ''))
 
+      # transforms user-data to expected
+      $location_custom_data = merge($location_trimmed, {
+        'autoindex' => $autoindex,
+      })
+
       # Takes gui ENV vars: fastcgi_param {ENV_NAME} {VALUE}
       $location_custom_cfg_append = prefix(
-        $location_trimmed['fast_cgi_params_extra'],
+        $location_custom_data['fast_cgi_params_extra'],
         'fastcgi_param '
       )
 
-      # separate from $location_trimmed because some values
+      # separate from $location_custom_data because some values
       # really need to be set to a default.
       # Removes fast_cgi_params_extra because it only exists in gui
       # not puppet-nginx
       $location_no_root = delete(merge({
         'vhost'                      => $key,
         'ssl'                        => $ssl,
         'location_custom_cfg_append' => $location_custom_cfg_append,
-      }, $location_trimmed), 'fast_cgi_params_extra')
+      }, $location_custom_data), 'fast_cgi_params_extra')
 
       # If www_root was removed with all the trimmings,
       # add it back it
 
@@ -1,19 +1,4 @@
 ENV['VAGRANT_DEFAULT_PROVIDER'] = 'aws'
-dir = File.dirname(File.expand_path(__FILE__))
-
-require 'yaml'
-require "#{dir}/puphpet/ruby/deep_merge.rb"
-
-configValues = YAML.load_file("#{dir}/puphpet/config.yaml")
-
-if File.file?("#{dir}/puphpet/config-custom.yaml")
-  custom = YAML.load_file("#{dir}/puphpet/config-custom.yaml")
-  configValues.deep_merge!(custom)
-end
-
-data = configValues['vagrantfile-aws']
-
-Vagrant.require_version '>= 1.6.0'
 
 Vagrant.configure('2') do |config|
   config.vm.box      = 'dummy'
@@ -59,7 +44,6 @@ Vagrant.configure('2') do |config|
     puppet.facter = {
       'ssh_username'     => "#{ssh_username}",
       'provisioner_type' => ENV['VAGRANT_DEFAULT_PROVIDER'],
-      'vm_target_key'    => 'vagrantfile-aws',
     }
     puppet.manifests_path = "#{data['vm']['provision']['puppet']['manifests_path']}"
     puppet.manifest_file  = "#{data['vm']['provision']['puppet']['manifest_file']}"