[ansible] Update genacls.sh files
by Nicolas Chauvet
commit aa2550a8bc1d63306ceeca7d6ee7fa72dbd951a8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Sep 22 22:46:59 2020 +0200
Update genacls.sh files
roles/distgit/templates/genacls.pkgdb | 2 +-
roles/distgit/templates/genacls.sh | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb
index e989474..4d14b65 100755
--- a/roles/distgit/templates/genacls.pkgdb
+++ b/roles/distgit/templates/genacls.pkgdb
@@ -34,7 +34,7 @@ if __name__ == '__main__':
'f15', 'f16': 'f16', 'f17': 'f17', 'f18': 'f18', 'f19': 'f19',
'f20': 'f20', 'f21': 'f21', 'f22': 'f22', 'f23': 'f23', 'f24': 'f24',
'f25': 'f25', 'f26': 'f26', 'f27': 'f27', 'f28': 'f28', 'f29': 'f29',
- 'f30': 'f30', 'f31': 'f31', 'f32': 'f32',
+ 'f30': 'f30', 'f31': 'f31', 'f32': 'f32', 'f33': 'f33',
'devel': 'master', 'master': 'master'}
# Create a "regex"ish list 0f the reserved branches
diff --git a/roles/distgit/templates/genacls.sh b/roles/distgit/templates/genacls.sh
old mode 100644
new mode 100755
index a00132b..394979b
--- a/roles/distgit/templates/genacls.sh
+++ b/roles/distgit/templates/genacls.sh
@@ -21,6 +21,14 @@ grep "repo nonfree/" ./gitolite.conf | \
sed 's/repo nonfree\///g' | \
sed "s/.*/'&' => 'nonfree\/&',/g" \
>> RepoAliases.pm
+grep "repo rpi/" ./gitolite.conf | \
+ sed 's/repo rpi\///g' | \
+ sed "s/.*/'&' => 'rpi\/&',/g" \
+ >> RepoAliases.pm
+grep "repo cuda/" ./gitolite.conf | \
+ sed 's/repo cuda\///g' | \
+ sed "s/.*/'&' => 'cuda\/&',/g" \
+ >> RepoAliases.pm
echo "};}1;" >> RepoAliases.pm
# With that done, move the files into place and run compile
3 years, 6 months
[ansible] Added RewriteRule for release packages
by Adrian Reber
commit eb30ad6a9daf481404dfdb710fd09218249219b6
Author: Adrian Reber <adrian(a)lisas.de>
Date: Mon Sep 7 14:19:40 2020 +0200
Added RewriteRule for release packages
Signed-off-by: Adrian Reber <adrian(a)lisas.de>
.../files/mirrorlist-server.common | 2 ++
.../mirrormanager/mirrorlist-server/tasks/main.yml | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/roles/mirrormanager/mirrorlist-server/files/mirrorlist-server.common b/roles/mirrormanager/mirrorlist-server/files/mirrorlist-server.common
index a911574..fb136c6 100644
--- a/roles/mirrormanager/mirrorlist-server/files/mirrorlist-server.common
+++ b/roles/mirrormanager/mirrorlist-server/files/mirrorlist-server.common
@@ -10,6 +10,8 @@ RewriteRule ^/(free|nonfree)/(fedora|el)/updates/([^/]+)/([^/]+)/?$ http://mirro
RewriteRule ^/(free|nonfree)/(fedora|el)/(rawhide|development)/([^/]+)/?$ http://mirrors.rpmfusion.org/mirrorlist?repo=$1-$2-rawhide&arch=$4 [R=301,last]
RewriteRule ^/(free|nonfree)/(fedora|el)/([^/]+)/([^/]+)/?$ http://mirrors.rpmfusion.org/mirrorlist?repo=$1-$2-$3&arch=$4 [R=301,last]
+RewriteRule ^/(free|nonfree)/(fedora|el)/rpmfusion-(free|nonfree)-release-(\d{1,2}).noarch.rpm https://mirrors.rpmfusion.org/mirrorlist?path=$1/$2/rpmfusion-$3-release-... [P]
+
RewriteCond %{HTTPS} !=on
RewriteCond %{REQUEST_URI} ^/statistics(.*)
RewriteRule ^/?(.*) https://mirrors.rpmfusion.org/$1 [R,L]
diff --git a/roles/mirrormanager/mirrorlist-server/tasks/main.yml b/roles/mirrormanager/mirrorlist-server/tasks/main.yml
index 744ed17..aa2f3e5 100644
--- a/roles/mirrormanager/mirrorlist-server/tasks/main.yml
+++ b/roles/mirrormanager/mirrorlist-server/tasks/main.yml
@@ -14,6 +14,8 @@
- mirrorlist-server
- geolite2-country
- certbot
+ - tmpwatch
+ - logrotate
tags:
- packages
- mirrorlist_server
3 years, 7 months