3 files changed, 43 insertions, 1 deletions
diff --git a/deployment/mgagit/templates/group_owned_repo.gl b/deployment/mgagit/templates/group_owned_repo.gl
new file mode 100644
index 00000000..0e5ae7c1
--- /dev/null
+++ b/deployment/mgagit/templates/group_owned_repo.gl
@@ -0,0 +1,28 @@
+[% SET maintainer = r.repos.$repo.maintainer %]
+repo [% repo %]
+   RW  master$    = [% maintainer %]
+   RW  distro/    = [% maintainer %]
+   RW  topic/     = [% maintainer %]
+   RW  refs/tags/ = [% maintainer %]
+[% IF r.repos.$repo.lockdown != 'yes' -%]
+   RW  master$    = @mga-<%= @repogroup %>
+   RW  distro/    = @mga-<%= @repogroup %>
+   RW  topic/     = @mga-<%= @repogroup %>
+   RW  refs/tags/ = @mga-<%= @repogroup %>
+[% END -%]
+   RW+ user/USER/ = @all
+   R              = @all
+[% IF r.repos.$repo.noemail -%]
+   config hooks.mailinglist = ""
+[% ELSE -%]
+[% IF r.repos.$repo.mailinglist -%]
+   config hooks.mailinglist = "[% r.repos.$repo.mailinglist %]"
+[% ELSE -%]
+   config hooks.mailinglist = "<%= @repoml %>-commits@ml.mageia.org"
+[% END -%]
+[% END -%]
+   config hooks.emailprefix = "[% repo %] "
+   config gitweb.description = "[% r.repos.$repo.description %]"
+[% IF r.users.$maintainer -%]
+   config gitweb.owner = "[% r.users.$maintainer.cn.0 %] [[% maintainer %]]"
+[% END -%]
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 %>
diff --git a/deployment/mgagit/templates/repodef_repo.gl b/deployment/mgagit/templates/repodef_repo.gl
new file mode 100644
index 00000000..399abda5
--- /dev/null
+++ b/deployment/mgagit/templates/repodef_repo.gl
@@ -0,0 +1,7 @@
+repo [% repo %]
+   RW  master$    = [% r.repos.$repo.maintainer %]
+   RW+ user/USER/ = @all
+   R              = @all
+   config hooks.mailinglist = sysadmin-commits@ml.mageia.org
+   config hooks.emailprefix = [% repo %]
+   config gitweb.description = [% r.repos.$repo.description %]