diff options
| author | Michael Scherer <misc@mageia.org> | 2010-11-04 17:51:05 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-11-04 17:51:05 +0000 |
| commit | fa0b4e76d515b2c6fb4764600135c58e35810dbb (patch) | |
| tree | f885637320f043a0a31b48e6773cf741e9d6488b /modules/catdap/templates | |
| parent | 6472f29d5e900404f67a98cfb8cfafba008219b6 (diff) | |
| download | puppet-fa0b4e76d515b2c6fb4764600135c58e35810dbb.tar puppet-fa0b4e76d515b2c6fb4764600135c58e35810dbb.tar.gz puppet-fa0b4e76d515b2c6fb4764600135c58e35810dbb.tar.bz2 puppet-fa0b4e76d515b2c6fb4764600135c58e35810dbb.tar.xz puppet-fa0b4e76d515b2c6fb4764600135c58e35810dbb.zip | |
- refactor the vhost
- fix the url used for svn checkout
- add a requires from catdap config to svn checkout for ordering purpose
- move extlookup call outside of template
- fix the name of apache config file
- fix the naming of the ldap server
Diffstat (limited to 'modules/catdap/templates')
| -rw-r--r-- | modules/catdap/templates/catdap_local.yml | 4 | ||||
| -rw-r--r-- | modules/catdap/templates/catdap_vhost.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/catdap/templates/catdap_local.yml b/modules/catdap/templates/catdap_local.yml index ec9f2753..c5299ef0 100644 --- a/modules/catdap/templates/catdap_local.yml +++ b/modules/catdap/templates/catdap_local.yml @@ -3,9 +3,9 @@ dc_suffix = 'dc=' + domain.gsub('.',',dc=') -ldap_server = 'ldap' + domain +ldap_server = 'ldap.' + domain -ldap_password = extlookup('catdap_password') +ldap_password = catdap_password ldap_account = 'cn=catdap-valstar,ou=System Accounts,' + dc_suffix %> diff --git a/modules/catdap/templates/catdap_vhost.conf b/modules/catdap/templates/catdap_vhost.conf index 6569e164..a6a2f0b9 100644 --- a/modules/catdap/templates/catdap_vhost.conf +++ b/modules/catdap/templates/catdap_vhost.conf @@ -1,5 +1,5 @@ <VirtualHost *:80> - ServerName identity.<%= domain %> + ServerName <%= catdap_vhost %> # Serve static content directly DocumentRoot <%= catdap_location %>/root Alias /static <%= catdap_location %>/root/static |