| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Conflicts:
manifests/config/file.pp
manifests/vhost/php/standard.pp
|
|
115691c87bad3f5863f088e73603133b67c9f828
this fixes the incorrectly nested case statement, and brings back the
lost 'config file as link' changes
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
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"
|
|
|
|
|
|
|
|
|
|
for vhost snippets in include.d
|
|
|
|
|
|
|
