aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-19 17:19:45 +0000
committerMichael Scherer <misc@mageia.org>2012-03-19 17:19:45 +0000
commit7f6682cfb0639fe64b8ac79554b9d3164c462b36 (patch)
treea84223991b70410ed560ca3dc5bee65c3c45f6a4
parent79a0ef03872196d78bddaec3d7b657dd288a4ab4 (diff)
downloadpuppet-7f6682cfb0639fe64b8ac79554b9d3164c462b36.tar
puppet-7f6682cfb0639fe64b8ac79554b9d3164c462b36.tar.gz
puppet-7f6682cfb0639fe64b8ac79554b9d3164c462b36.tar.bz2
puppet-7f6682cfb0639fe64b8ac79554b9d3164c462b36.tar.xz
puppet-7f6682cfb0639fe64b8ac79554b9d3164c462b36.zip
split instance in a separate file
-rw-r--r--modules/phpbb/manifests/init.pp108
-rw-r--r--modules/phpbb/manifests/instance.pp80
2 files changed, 80 insertions, 108 deletions
diff --git a/modules/phpbb/manifests/init.pp b/modules/phpbb/manifests/init.pp
deleted file mode 100644
index 90248384..00000000
--- a/modules/phpbb/manifests/init.pp
+++ /dev/null
@@ -1,108 +0,0 @@
-class phpbb {
- define redirection_instance($url) {
- $lang = $name
- file { "/etc/httpd/conf/vhosts.d/forums.d/redirect_$name.conf":
- content => template("phpbb/forums_redirect.conf"),
- notify => Exec['service httpd configtest'],
- }
- }
-
- define databases(){
- Phpbb::Locale_db <<| |>>
- }
-
- define locale_db($tag = "default",
- $user = $phpbb::base::user) {
- postgresql::database { $name:
- description => "$lang db for phpbb forum",
- user => $user,
- tag => $tag,
- # this break due to the way it is remotely declared
- # this should only be a issue in case of bootstrapping again
- # require => Postgresql::User[$user]
- }
- }
-
- # TODO find a way to avoid all the phpbb::base prefix
- define instance() {
- include phpbb::base
-
- $lang = $name
- $database = "${phpbb::base::db}_$lang"
-
- $user = $phpbb::base::user
- $pgsql_password = $phpbb::base::pgsql_password
- $forums_dir = $phpbb::base::forums_dir
-
- include git::client
- exec { "git_clone $lang":
- command =>"git clone git://git.$domain/forum/ $lang",
- cwd => $forums_dir,
- creates => "$forums_dir/$lang",
- require => File["$forums_dir"],
- notify => Exec["rm_install $lang"],
- }
-
- # remove this or the forum will not work ( 'board disabled' )
- # maybe it would be better to move this elsehwere, I
- # am not sure ( and in any case, that's still in git )
- exec { "rm_install $lang":
- command => "rm -Rf $forums_dir/$lang/phpBB/install",
- onlyif => "test -d $forums_dir/$lang/phpBB/install",
- }
-
- # list found by reading ./install/install_install.php
- # end of check_server_requirements ( 2 loops )
-
- $writable_dirs = ['cache',
- 'images/avatars/upload',
- 'files',
- 'store' ]
-
- $dir_names = regsubst($writable_dirs,'^',"$forums_dir/$lang/phpBB/")
-
- file { $dir_names:
- ensure => directory,
- owner => apache,
- require => Exec["git_clone $lang"],
- }
-
- file { "$forums_dir/$lang/phpBB/config.php":
- content => template("phpbb/config.php"),
- }
-
- @@phpbb::locale_db { $database:
- user => $user,
- }
-
- Phpbb::Config {
- database => $database,
- }
-
- $ldap_password = extlookup("phpbb_ldap",'x')
-
- phpbb::config {
- "ldap_user/$lang":
- key => "ldap_user", value => "cn=phpbb-$hostname,ou=System Accounts,$dc_suffix";
- "ldap_server/$lang":
- key => "ldap_server", value => "ldaps://ldap.$domain ldaps://ldap-slave-1.$domain";
- "ldap_password/$lang":
- key => "ldap_password", value => $ldap_password;
- "ldap_base_dn/$lang":
- key => "ldap_base_dn", value => "ou=People,$dc_suffix";
- "auth_method/$lang":
- key => "auth_method", value => "ldap";
- "ldap_mail/$lang":
- key => "ldap_mail", value => "mail";
- "ldap_uid/$lang":
- key => "ldap_uid", value => "uid";
- "cookie_domain/$lang":
- key => "cookie_domain", value => "forums.$domain";
- "server_name/$lang":
- key => "server_name", value => "forums.$domain";
- "default_lang/$lang":
- key => "default_lang", value => $lang;
- }
-
- }
-}
diff --git a/modules/phpbb/manifests/instance.pp b/modules/phpbb/manifests/instance.pp
new file mode 100644
index 00000000..d260ff7b
--- /dev/null
+++ b/modules/phpbb/manifests/instance.pp
@@ -0,0 +1,80 @@
+define phpbb::instance() {
+ include phpbb::base
+
+ $lang = $name
+ $database = "${phpbb::base::db}_$lang"
+
+ $user = $phpbb::base::user
+ $pgsql_password = $phpbb::base::pgsql_password
+ $forums_dir = $phpbb::base::forums_dir
+
+ include git::client
+ exec { "git_clone $lang":
+ command =>"git clone git://git.$::domain/forum/ $lang",
+ cwd => $forums_dir,
+ creates => "$forums_dir/$lang",
+ require => File[$forums_dir],
+ notify => Exec["rm_install $lang"],
+ }
+
+ # remove this or the forum will not work ( 'board disabled' )
+ # maybe it would be better to move this elsehwere, I
+ # am not sure ( and in any case, that's still in git )
+ exec { "rm_install $lang":
+ command => "rm -Rf $forums_dir/$lang/phpBB/install",
+ onlyif => "test -d $forums_dir/$lang/phpBB/install",
+ }
+
+ # list found by reading ./install/install_install.php
+ # end of check_server_requirements ( 2 loops )
+
+ $writable_dirs = ['cache',
+ 'images/avatars/upload',
+ 'files',
+ 'store' ]
+
+ $dir_names = regsubst($writable_dirs,'^',"$forums_dir/$lang/phpBB/")
+
+ file { $dir_names:
+ ensure => directory,
+ owner => 'apache',
+ require => Exec["git_clone $lang"],
+ }
+
+ file { "$forums_dir/$lang/phpBB/config.php":
+ content => template('phpbb/config.php'),
+ }
+
+ @@phpbb::locale_db { $database:
+ user => $user,
+ }
+
+ Phpbb::Config {
+ database => $database,
+ }
+
+ $ldap_password = extlookup( 'phpbb_ldap','x')
+
+ phpbb::config {
+ "ldap_user/$lang":
+ key => 'ldap_user', value => "cn=phpbb-$::hostname,ou=System Accounts,$::dc_suffix";
+ "ldap_server/$lang":
+ key => 'ldap_server', value => "ldaps://ldap.$::domain ldaps://ldap-slave-1.$::domain";
+ "ldap_password/$lang":
+ key => 'ldap_password', value => $ldap_password;
+ "ldap_base_dn/$lang":
+ key => 'ldap_base_dn', value => "ou=People,$::dc_suffix";
+ "auth_method/$lang":
+ key => 'auth_method', value => 'ldap';
+ "ldap_mail/$lang":
+ key => 'ldap_mail', value => 'mail';
+ "ldap_uid/$lang":
+ key => 'ldap_uid', value => 'uid';
+ "cookie_domain/$lang":
+ key => 'cookie_domain', value => "forums.$::domain";
+ "server_name/$lang":
+ key => 'server_name', value => "forums.$::domain";
+ "default_lang/$lang":
+ key => 'default_lang', value => $lang;
+ }
+}