tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added ejabberd extauth support to wiki::collab::base

Browse source
This commit is contained in:
Ossi Salmi 2011-06-01 12:45:40 +03:00 • committed by Timo Mkinen
parent 856b42ad59
commit dc93fe0baa
2 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
wiki/manifests/init.pp
View file

@ -98,6 +98,13 @@ class wiki::collab inherits wiki::graphingwiki::common {
# $wiki_collab_fqdn: # $wiki_collab_fqdn:
# FQDN of collab virtual host. Defaults to $homename. # FQDN of collab virtual host. Defaults to $homename.
# #
# $wiki_collab_jabberdomain:
# Domain for jabber extauth.
#
# $wiki_collab_conferencedomain:
# Conference domain for jabber extauth.
# Defaults to conference.$wiki_collab_jabberdomain.
#
class wiki::collab::base { class wiki::collab::base {
include cairo::python include cairo::python
@ -117,14 +124,11 @@ class wiki::collab::base {
include user::system include user::system
realize(User["collab"], Group["collab"]) realize(User["collab"], Group["collab"])
case $operatingsystem { exec { "usermod-www-data":
debian,ubuntu: { path => "/bin:/usr/bin:/sbin:/usr/sbin",
exec { "usermod-www-data": command => "usermod -a -G collab ${apache::sslserver::user}",
path => "/bin:/usr/bin:/sbin:/usr/sbin", unless => "id -n -G ${apache::sslserver::user} | grep '\\bcollab\\b'",
command => "usermod -a -G collab www-data", require => Group["collab"],
unless => "id -n -G www-data | grep '\\bcollab\\b'",
}
}
} }
if $wiki_datadir { if $wiki_datadir {
@ -231,15 +235,17 @@ class wiki::collab::base {
group => root, group => root,
} }
if $wiki_collab_jabberdomain and !$wiki_collab_conferencedomain {
$wiki_collab_conferencedomain = "conference.${wiki_collab_jabberdomain}"
}
file { "/etc/local/collab/collab.ini": file { "/etc/local/collab/collab.ini":
ensure => present, ensure => present,
mode => 0644, mode => 0644,
owner => root, owner => root,
group => root, group => root,
source => "/usr/local/src/graphingwiki/collab/config/collab.ini", content => template("wiki/collab.ini.erb"),
replace => false, require => File["/etc/local/collab"],
require => [ File["/etc/local/collab"],
Python::Setup::Install["/usr/local/src/graphingwiki/collab"], ],
} }
if !$wiki_collab_fqdn { if !$wiki_collab_fqdn {

25
wiki/templates/collab.ini.erb Normal file
View file

@ -0,0 +1,25 @@
[collab]
logconf=/srv/wikis/collab/config/logging.conf
## directory also in per instance configs
farmconf=/srv/wikis/collab/config/collabfarm.py
## also in <htmldir>/.htaccess
htpasswd=/srv/wikis/collab/run/.htpasswd
htgroup=/srv/wikis/collab/run/.htgroup
## also in collabfarm.py
htmldir=/srv/wikis/collab/htdocs
userdir=/srv/wikis/collab/user
cachedir=/srv/wikis/collab/cache
wikidir=/srv/wikis/collab/wikis
## only here
baseinstancedir=/srv/wikis/collab/wikis/collab
archivedir=/srv/wikis/collab/archive
piddir=/srv/wikis/collab/run
helperuser=collab
## for collab-auth-ejabberd
cacherefreshtime=30
<% if has_variable?("wiki_collab_jabberdomain") -%>
[jabber]
## also in ejabberd.cfg
jabberdomain=<%= wiki_collab_jabberdomain %>
conferencedomain=<%= wiki_collab_conferencedomain %>
<% end -%>