aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mgagit/templates/mgagit.conf
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-08-20 21:42:52 +0000
committerColin Guthrie <colin@mageia.org>2013-08-20 21:42:52 +0000
commitd0f8559baf5bdcaab9f04aaeb2d945efdadb94e5 (patch)
tree63c62537f31fd8a78706b1337e0f440b0c5e21d0 /deployment/mgagit/templates/mgagit.conf
parent0f533467f2b813cacebcb420852b2d8045709482 (diff)
downloadpuppet-d0f8559baf5bdcaab9f04aaeb2d945efdadb94e5.tar
puppet-d0f8559baf5bdcaab9f04aaeb2d945efdadb94e5.tar.gz
puppet-d0f8559baf5bdcaab9f04aaeb2d945efdadb94e5.tar.bz2
puppet-d0f8559baf5bdcaab9f04aaeb2d945efdadb94e5.tar.xz
puppet-d0f8559baf5bdcaab9f04aaeb2d945efdadb94e5.zip
mgagit: Add repo templates to puppet rather than reply on packaged versions
This adds the repo template into puppet as this seems a more appropriate place to track what is effectively configuration. I also use this opportunity to add a repository configuration repo for 'web' and add a new repo template for it accordingly.
Diffstat (limited to 'deployment/mgagit/templates/mgagit.conf')
-rw-r--r--deployment/mgagit/templates/mgagit.conf9
1 files changed, 8 insertions, 1 deletions
diff --git a/deployment/mgagit/templates/mgagit.conf b/deployment/mgagit/templates/mgagit.conf
index a818c93a..783f6fea 100644
--- a/deployment/mgagit/templates/mgagit.conf
+++ b/deployment/mgagit/templates/mgagit.conf
@@ -4,6 +4,7 @@ ldapserver: <%= @ldap_server %>
binddn: <%= @binddn %>
bindpwfile: <%= @bindpwfile %>
pubkey_dir: <%= @gitolite_keydir %>
+tmpl_dir: <%= @gitolite_tmpldir %>
gitolite_config: <%= @gitolite_conf %>
run_gitolite: yes
repodef_dir: <%= @reposconf_dir %>
@@ -13,8 +14,14 @@ repos_config:
repos:
- name: software
maintainer: '@mga-sysadmin'
- description: Software repositories definitions
+ description: Software repository definitions
+ - name: web
+ maintainer: '@mga-sysadmin'
+ description: Website repository definitions
- prefix: software
gl_template: soft_repo
git_url: file:///git/infrastructure/repositories/software.git
+ - prefix: web
+ gl_template: web_repo
+ git_url: file:///git/infrastructure/repositories/web.git
www_dir: <%= @vhostdir %>