aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/repositories
diff options
context:
space:
mode:
Diffstat (limited to 'deployment/repositories')
-rw-r--r--deployment/repositories/manifests/git.pp11
-rw-r--r--deployment/repositories/manifests/git_mirror.pp22
-rw-r--r--deployment/repositories/manifests/sparkleshare.pp11
-rw-r--r--deployment/repositories/manifests/subversion.pp64
-rw-r--r--deployment/repositories/manifests/svn_mirror.pp12
-rw-r--r--deployment/repositories/templates/puppet_update.sudoers1
6 files changed, 49 insertions, 72 deletions
diff --git a/deployment/repositories/manifests/git.pp b/deployment/repositories/manifests/git.pp
deleted file mode 100644
index 46445647..00000000
--- a/deployment/repositories/manifests/git.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class repositories::git {
- git::repository { '/git/forum':
- description => "Reference code for forum.$::domain",
- group => 'mga-forum-developers',
- }
-
- git::repository { '/git/initscripts':
- description => 'Source for initscripts package',
- group => 'mga-packagers-committers',
- }
-}
diff --git a/deployment/repositories/manifests/git_mirror.pp b/deployment/repositories/manifests/git_mirror.pp
index 9d213441..7384b5a8 100644
--- a/deployment/repositories/manifests/git_mirror.pp
+++ b/deployment/repositories/manifests/git_mirror.pp
@@ -1,16 +1,16 @@
class repositories::git_mirror {
- file { '/git':
- ensure => directory,
- }
+ #file { '/git':
+ # ensure => directory,
+ #}
- git::mirror { '/git/forum/':
- description => "Reference code for forum.$::domain",
- source => "git://git.$::domain/forum/",
- }
+ #git::mirror { '/git/forum/':
+ # description => "Reference code for forum.${::domain}",
+ # source => "git://git.${::domain}/forum/",
+ #}
- git::mirror { '/git/initscripts/':
- description => 'Reference code for Initscripts',
- source => "git://git.$::domain/initscripts/",
- }
+ #git::mirror { '/git/initscripts/':
+ # description => 'Reference code for Initscripts',
+ # source => "git://git.${::domain}/initscripts/",
+ #}
}
diff --git a/deployment/repositories/manifests/sparkleshare.pp b/deployment/repositories/manifests/sparkleshare.pp
deleted file mode 100644
index 302e07c1..00000000
--- a/deployment/repositories/manifests/sparkleshare.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class repositories::sparkleshare {
- $sp_dir = '/git/sparkleshare'
- file { $sp_dir:
- ensure => directory,
- }
-
- git::repository { "$sp_dir/test":
- description => 'Test sparkleshare repository',
- group => 'mga-packagers-committers',
- }
-}
diff --git a/deployment/repositories/manifests/subversion.pp b/deployment/repositories/manifests/subversion.pp
index 56b6db6d..4c4ef847 100644
--- a/deployment/repositories/manifests/subversion.pp
+++ b/deployment/repositories/manifests/subversion.pp
@@ -1,15 +1,19 @@
class repositories::subversion {
- Subversion::Repository {
- cia_post => true,
- cia_ignore_author => '^schedbot$',
- }
+ # Be sure that any mailing list found in commit_mail here whitelists
+ # "subversion_noreply@ml.mageia.org" as a sender by adding it to
+ # sender_email in its sympa::list::X configuration in
+ # deployment/lists/manifests/init.pp
subversion::repository { '/svn/adm/':
group => 'mga-sysadmin',
- commit_mail => ["sysadmin-commits@ml.$::domain"],
+ commit_mail => ["sysadmin-commits@ml.${::domain}"],
syntax_check => ['check_puppet_templates','check_puppet'],
- cia_module => 'sysadm',
+ }
+
+ subversion::repository { '/svn/advisories':
+ group => 'mga-qa-committers',
+ commit_mail => ["qa-commits@ml.${::domain}"],
}
sudo::sudoers_config { 'puppet_update':
@@ -22,55 +26,49 @@ class repositories::subversion {
subversion::repository { '/svn/org/':
group => 'mga-board',
- commit_mail => ["board-commits@ml.$::domain"],
- cia_post => true,
- cia_module => 'org',
+ commit_mail => ["board-commits@ml.${::domain}"],
}
subversion::repository { '/svn/soft/':
group => 'mga-packagers',
- commit_mail => ["soft-commits@ml.$::domain"],
+ commit_mail => ["soft-commits@ml.${::domain}"],
syntax_check => ['check_po'],
- cia_module => 'soft',
- i18n_mail => ["mageia-i18n@$::domain"],
+ i18n_mail => ["i18n-reports@ml.${::domain}"],
}
subversion::repository { '/svn/soft_publish/':
group => 'mga-packagers',
- commit_mail => ["soft-commits@ml.$::domain"],
- cia_post => true,
- cia_module => 'soft_publish',
+ commit_mail => ["soft-commits@ml.${::domain}"],
}
subversion::repository { '/svn/web/':
group => 'mga-web',
+ commit_mail => ["atelier-commits@ml.${::domain}"],
syntax_check => ['check_php'],
- cia_module => 'web',
}
subversion::repository { '/svn/packages/':
group => 'mga-packagers-committers',
no_binary => true,
- commit_mail => ["packages-commits@ml.$::domain"],
- cia_module => 'packages',
- }
-
- file { '/svn/binrepos/':
- ensure => directory,
- mode => '0700',
+ commit_mail => ["packages-commits@ml.${::domain}"],
+ nonmaintainer_mail => true,
}
- subversion::repository { '/svn/binrepos/cauldron/':
- group => 'mga-packagers-committers',
- cia_module => 'binrepos',
- }
-
- file { '/svn/binrepos/updates/':
- ensure => directory
+ subversion::repository { '/svn/test-irker/':
+ group => 'mga-packagers',
+ no_binary => true,
+ commit_mail => ["tmb@${::domain}"],
+ irker_conf => {
+ project => 'mageia',
+ repo => 'testrepo',
+ tinyifier => 'https://is.gd/create.php?format=simple&url=',
+ urlprefix => "https://svnweb.${::domain}/%(repo)?view=revision&revision=",
+ channels => '{irc://chat.freenode.net/commits, irc://chat.freenode.net/test-irker}',
+ },
}
- subversion::repository { '/svn/binrepos/updates/1/':
- group => 'mga-packagers-committers',
- cia_module => 'binrepos_1',
+ subversion::repository { '/svn/treasurer/':
+ group => 'mga-treasurer',
+ commit_mail => ["treasurer-commits@ml.${::domain}"],
}
}
diff --git a/deployment/repositories/manifests/svn_mirror.pp b/deployment/repositories/manifests/svn_mirror.pp
index 570b3326..d71e896d 100644
--- a/deployment/repositories/manifests/svn_mirror.pp
+++ b/deployment/repositories/manifests/svn_mirror.pp
@@ -4,11 +4,13 @@ class repositories::svn_mirror {
}
subversion::mirror_repository {
- '/svn/adm/': source => "svn://svn.$::domain/svn/adm/";
- '/svn/soft/': source => "svn://svn.$::domain/svn/soft/";
- '/svn/web/': source => "svn://svn.$::domain/svn/web/";
- '/svn/packages/': source => "svn://svn.$::domain/svn/packages/";
- '/svn/org/': source => "svn://svn.$::domain/svn/org/";
+ '/svn/adm/': source => "svn://svn.${::domain}/svn/adm/";
+ '/svn/advisories/':source => "svn://svn.${::domain}/svn/advisories/";
+ '/svn/soft/': source => "svn://svn.${::domain}/svn/soft/";
+ '/svn/web/': source => "svn://svn.${::domain}/svn/web/";
+ '/svn/packages/': source => "svn://svn.${::domain}/svn/packages/";
+ '/svn/org/': source => "svn://svn.${::domain}/svn/org/";
+ '/svn/treasurer/': source => "svn://svn.${::domain}/svn/treasurer/";
}
# no binrepos, too big to mirror
diff --git a/deployment/repositories/templates/puppet_update.sudoers b/deployment/repositories/templates/puppet_update.sudoers
index 154bc9c1..42235771 100644
--- a/deployment/repositories/templates/puppet_update.sudoers
+++ b/deployment/repositories/templates/puppet_update.sudoers
@@ -1,2 +1 @@
%mga-sysadmin ALL= NOPASSWD: /usr/bin/svn update -q --non-interactive --accept theirs-full /etc/puppet
-
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-15 11:32:03 +0000