Age | Commit message (Collapse) | Author |
|
Fixed apache_no_default_site variable to be a parameter to the apache
class (no_default_site = false)
Conflicts:
files/include.d/Debian/ssl_defaults.inc
manifests/base.pp
manifests/config/file.pp
manifests/vhost.pp
manifests/vhost/php/standard.pp
manifests/vhost/template.pp
templates/vhosts/php/CentOS.erb
templates/vhosts/php/Debian.erb
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
service is managed
|
|
http://git.zx2c4.com/w3-total-fail/tree/w3-total-fail.sh
to all wordpress vhosts
mend
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
hosts by setting the $apache_no_default_site variable
|
|
|
|
the default value for package_name in apache::debian::module is
'absent'. Using an empty value makes apache::module's default value
break, saying that the package '' (nothing) cannot be found.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
using $name in a default value doesn't work in 2.6.x, we need to verify
the argument's value inside the manifests.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
usually, closing a curly bracket on the same line as the code is done
when it is opened on the same line, too. here we'd rather align it to
the "default:" to make the code easier to read.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
apache::debian::module which means you have to specify the operating system in the class that you called for deployment of the module. so I abstracted that by creating the class apache::module in manifests/module.pp which just did an fact check and then depending on the result, called the correct class for module deployment
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
some runs produce an error because of a missing "require" link from
'include_dir' to the apache package:
err: /Stage[main]/Apache::Base/File[include_dir]/ensure: change from
absent to directory failed: Cannot create /etc/apache2/include.d; parent
directory /etc/apache2 does not exist
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Currently, when trying to remove a config file that is not present in
one of the source directories, you get an error about puppet not being
able to find the file, which kills the puppet run.
We need a special case for when $ensure is set to 'absent' or 'purged'
so that we avoid setting the source argument.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
Some packages in Debian manage an Apache config file in their own /etc
directory and create a link to that file in Apache's conf.d directory.
One example package that does this is nagios3.
Introduce a new argument, $target, that can be used to specify the link
destination. When using $target, the value to $ensure must also be
'link' to make the file into a symbolic link. This is to make it
explicit when we want the apache::config::file to behave differently
than the normal behaviour of creating a plain text file in conf.d.
Signed-off-by: Gabriel Filion <lelutin@gmail.com>
|
|
The $source argument is not flexible enough as it is. It currently
forces the source to be unique.
Sometimes we'd like to be able to specify an array of possible sources.
So we'll use the $source directly with the file resource without
enforcing its format.
WATCH OUT: this could break currently deployed apache::config::file
resources, so one should change occurences of this resource's argument
from:
source => "modules/site-apache/blah"
to a full source specification string:
source => "puppet:///modules/site-apache/blah"
|
|
Currently, the code expects $ensure to be either 'present' or 'absent'
when enabling/disabling the concerned module.
It does not take into account that other values could be set.
Those other values could be 'purged' and any specific version tag.
'purged' must behave similarly to 'absent' (e.g. disable the module)
and all other cases ('present' and a version tag) must enable the
module.
|
|
|
|
|
|
|
|
|