Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
riseup-puppet-recipes
sympa
Commits
2cf8e8e3
Commit
2cf8e8e3
authored
Oct 20, 2012
by
micah
💬
Browse files
move to new apache submodule, and lint
parent
6aae0fce
Changes
2
Hide whitespace changes
Inline
Side-by-side
manifests/fastcgi.pp
View file @
2cf8e8e3
class
sympa::fastcgi
{
case
$operatingsystem
{
debian
:
{
include
sympa::fastcgi::debian
}
mageia
:
{
include
sympa::fastcgi::mageia
}
default
:
{
include
sympa::fastcgi::default
}
}
case
$operatingsystem
{
debian
:
{
include
sympa::fastcgi::debian
}
mageia
:
{
include
sympa::fastcgi::mageia
}
default
:
{
include
sympa::fastcgi::default
}
}
file
{
"/var/lib/apache2/fastcgi"
:
ensure
=>
present
,
owner
=>
root
,
group
=>
sympa
,
mode
=>
0775
,
require
=>
Package
[
"libapache2-mod-fastcgi"
];
"/var/lib/apache2/fastcgi/dynamic"
:
ensure
=>
present
,
owner
=>
root
,
group
=>
sympa
,
mode
=>
0770
,
require
=>
File
[
"/var/lib/apache2/fastcgi"
];
}
'/var/lib/apache2/fastcgi'
:
ensure
=>
present
,
owner
=>
root
,
group
=>
sympa
,
mode
=>
'0775'
,
require
=>
Package
[
'libapache2-mod-fastcgi'
];
'/var/lib/apache2/fastcgi/dynamic'
:
ensure
=>
present
,
owner
=>
root
,
group
=>
sympa
,
mode
=>
'0770'
,
require
=>
File
[
'/var/lib/apache2/fastcgi'
];
apache2::envvars
{
# FIXME: is this still needed?
"fastcgi_user"
:
# I dont know, but I changed it from apache2::envvars to a file resource
# in order to switch from the old apache module to the new one (which
# doesn't support envvars)
'/etc/apache2/envvars'
content
=>
"export APACHE_PID_FILE=/var/run/apache2.pid
\n
export APACHE_RUN_USER=sympa
\n
export APACHE_RUN_GROUP=sympa
\n
export APACHE_RUN_DIR=/var/run/apache2
$SUFFIX
\n
export APACHE_LOCK_DIR=/var/lock/apache2
$SUFFIX
\n
export APACHE_LOG_DIR=/var/log/apache2
$SUFFIX
\n\n
export LANG=C
\n
export LANG
\n
"
}
apache
2
::module
{
"
fastcgi
"
:
ensure
=>
present
,
require_package
=>
"
libapache2-mod-fastcgi
"
;
"
fcgid
"
:
ensure
=>
absent
;
apache::module
{
'
fastcgi
'
:
ensure
=>
present
,
require_package
=>
'
libapache2-mod-fastcgi
'
;
'
fcgid
'
:
ensure
=>
absent
;
}
}
manifests/fcgid.pp
View file @
2cf8e8e3
...
...
@@ -5,12 +5,12 @@ class sympa::fcgid {
default
:
{
include
sympa::fcgid::default
}
}
apache
2
::module
{
apache::module
{
# we need a way to set things in fcgid.conf, but the apache2 module
# we're currently (Aug 2011) using doesn't support that, so we deliver
# it as a file below
"
fcgid
"
:
ensure
=>
present
,
require_package
=>
"
libapache2-mod-fcgid
"
;
"
fastcgi
"
:
ensure
=>
absent
;
'
fcgid
'
:
ensure
=>
present
,
require_package
=>
'
libapache2-mod-fcgid
'
;
'
fastcgi
'
:
ensure
=>
absent
;
}
file
{
...
...
@@ -19,9 +19,9 @@ class sympa::fcgid {
# now we just deliver the file
# FIXME: a newer augeas supports making the changes that this file delivers
# move to it once we have it backported
"
/etc/apache2/mods-available/fcgid.conf
"
:
source
=>
"
$fileserver
/apache2/fcgid.conf"
,
owner
=>
root
,
group
=>
root
,
mode
=>
0644
;
'
/etc/apache2/mods-available/fcgid.conf
'
:
source
=>
"
$
::
fileserver
/apache2/fcgid.conf"
,
owner
=>
root
,
group
=>
root
,
mode
=>
'
0644
'
;
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment