Merge branch 'master' into theme-5.0

Author: jtreminio

archive/puphpet/puppet/Puppetfile

@@ -26,7 +26,7 @@ mod 'puppetlabs/firewall',
     :ref => '1.1.1'
 mod 'puppetlabs/java',
     :git => 'https://github.com/puppetlabs/puppetlabs-java.git',
-    :ref => '1.2.0'
+    :ref => '1.3.0'
 mod 'attachmentgenie/locales',
     :git => 'https://github.com/attachmentgenie/attachmentgenie-locales.git',
     :ref => '1.1.1'

archive/puphpet/puppet/nodes/Apache.pp

@@ -38,8 +38,9 @@
   # centos 2.4 installation creates webroot automatically,
   # requiring us to manually set owner and permissions via exec
   exec { 'Create apache webroot':
-    command => "mkdir -m 775 -p ${www_root} && \
+    command => "mkdir -p ${www_root} && \
                 chown root:${webroot_group} ${www_root} && \
+                chmod 775 ${www_root} && \
                 touch /.puphpet-stuff/apache-webroot-created",
     creates => '/.puphpet-stuff/apache-webroot-created',
     require => [

src/Puphpet/Extension/ApacheBundle/Resources/views/form.html.twig

@@ -1,6 +1,14 @@
 {% import "PuphpetMainBundle:front:macros/popover.html.twig" as popover %}
 <section id="apache">
     <div class="row">
+        <div class="col-xs-12">
+            <div class="alert alert-danger" role="alert">
+                <p>
+                    <strong>Warning!</strong>
+                    PuPHPet has dropped support for mod_php. You are encouraged to use fastcgi.
+                </p>
+            </div>
+        </div>
         <div class="col-xs-12">
             <div class="panel panel-default">
                 <div class="panel-heading">