summaryrefslogtreecommitdiffstats
path: root/modules/tozt
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2019-10-22 13:29:44 -0400
committerJesse Luehrs <doy@tozt.net>2019-10-22 13:29:44 -0400
commit5185d280b7d058f6d0064a5c4d62170ddc55d0d9 (patch)
tree460928af5a45d28b6fc82b7abe83087e593263dc /modules/tozt
parente838540f23e3dfa7cb41b90cb5d922dd7608d77f (diff)
downloadpuppet-tozt-5185d280b7d058f6d0064a5c4d62170ddc55d0d9.tar.gz
puppet-tozt-5185d280b7d058f6d0064a5c4d62170ddc55d0d9.zip
add some nginx config for serving release tarballs
Diffstat (limited to 'modules/tozt')
-rw-r--r--modules/tozt/files/nginx/git-tls.conf13
-rw-r--r--modules/tozt/manifests/git.pp19
2 files changed, 32 insertions, 0 deletions
diff --git a/modules/tozt/files/nginx/git-tls.conf b/modules/tozt/files/nginx/git-tls.conf
index 6e0dfbb..2c3e761 100644
--- a/modules/tozt/files/nginx/git-tls.conf
+++ b/modules/tozt/files/nginx/git-tls.conf
@@ -10,6 +10,19 @@ server {
root /usr/share/webapps/cgit;
try_files $uri @cgit;
+ location ~ ^/([^/]+)/releases$ {
+ return 301 $scheme://$host$request_uri/;
+ }
+
+ location ~ ^/([^/]+)/releases/$ {
+ alias /home/doy/releases/$1/;
+ autoindex on;
+ }
+
+ location ~ ^/([^/]+)/releases/(.*)$ {
+ alias /home/doy/releases/$1/$2;
+ }
+
location @cgit {
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root/cgit.cgi;
diff --git a/modules/tozt/manifests/git.pp b/modules/tozt/manifests/git.pp
index 19f7342..ce6de9a 100644
--- a/modules/tozt/manifests/git.pp
+++ b/modules/tozt/manifests/git.pp
@@ -27,6 +27,25 @@ class tozt::git {
Group['doy'],
File["/home/doy"],
];
+ "/media/persistent/releases/doy":
+ ensure => directory,
+ owner => 'doy',
+ group => 'doy',
+ require => [
+ Class['tozt::persistent'],
+ User['doy'],
+ Group['doy'],
+ ];
+ "/home/doy/releases":
+ ensure => link,
+ target => "/media/persistent/releases/doy",
+ owner => 'doy',
+ group => 'doy',
+ require => [
+ User['doy'],
+ Group['doy'],
+ File["/home/doy"],
+ ];
"/etc/cgitrc":
source => "puppet:///modules/tozt/cgitrc";
"/usr/local/share/git":