diff -r 695111d1eec9 -r 76a47f714766 dev/provisioning/modules/sysconfig/manifests/apache.pp --- a/dev/provisioning/modules/sysconfig/manifests/apache.pp Tue Nov 15 23:35:59 2016 +0100 +++ b/dev/provisioning/modules/sysconfig/manifests/apache.pp Fri Nov 18 14:48:49 2016 +0100 @@ -3,63 +3,6 @@ ) inherits sysconfig::params { notify {'apache': name => "\$vhost : ${vhost}", withpath => true } - #remove system apache - # package { "audit-libs": - # ensure => present - # }-> - # package {"rhscl-httpd24-epel-7-x86_64": - # ensure => present, - # source => "https://www.softwarecollections.org/en/scls/rhscl/httpd24/epel-7-x86_64/download/rhscl-httpd24-epel-7-x86_64.noarch.rpm", - # provider => rpm, - # }-> - # class { '::apache': - # default_vhost => false, - # apache_name => 'httpd24-httpd', - # service_name => 'httpd24-httpd', - # httpd_dir => "/opt/rh/httpd24/root/etc/httpd", - # server_root => "/opt/rh/httpd24/root/etc/httpd", - # conf_dir => "/opt/rh/httpd24/root/etc/httpd/conf", - # confd_dir => "/opt/rh/httpd24/root/etc/httpd/conf.d", - # mod_dir => "/opt/rh/httpd24/root/etc/httpd/conf.d", - # vhost_dir => "/opt/rh/httpd24/root/etc/httpd/conf.d", - # ports_file => "/opt/rh/httpd24/root/etc/httpd/conf.d/ports.conf" - # } - # class { '::apache': - # default_vhost => false, - # server_signature => 'off', - # server_tokens => 'prod' - # } - # file {[ "/var/www/corpusdelaparole", - # "/var/www/corpusdelaparole/corpus", - # "/var/www/corpusdelaparole/drupal"]: - # ensure => directory, - # owner => 'apache', - # group => 'apache' - # }-> - # file { "/etc/www": - # ensure => directory, - # }-> - # ::apache::vhost { $vhost: - # port => '80', - # docroot => "/var/www/corpusdelaparole/drupal", - # options => ['-indexes'], - # aliases => [ - # { alias => '/corpus', path => "/var/www/corpusdelaparole/corpus/public" }, - # ], - # use_optional_includes => true, - # directories => [ - # { - # path => "/var/www/corpusdelaparole/drupal", - # allow_override => ['all',] - # }, - # { - # path => "/var/www/corpusdelaparole/corpus/public", - # allow_override => ['all',], - # } - # ], - # custom_fragment => " \n IncludeOptional /etc/www/corpus_env.con[f]\n ", - # } - $apache_packages = [ 'httpd' ]