diff options
| -rw-r--r-- | deployment/services/cgit.scm | 29 | ||||
| -rw-r--r-- | deployment/services/version-control.scm | 16 |
2 files changed, 28 insertions, 17 deletions
diff --git a/deployment/services/cgit.scm b/deployment/services/cgit.scm index 8ff6662..e44252f 100644 --- a/deployment/services/cgit.scm +++ b/deployment/services/cgit.scm @@ -6,6 +6,8 @@ #:use-module (gnu services) #:use-module (gnu services cgit) #:use-module (gnu services web) + #:use-module ((deployment services version-control) + #:prefix deployment:services:version-control:) #:use-module ((deployment services web) #:prefix deployment:services:web:) #:use-module ((gnu packages version-control) @@ -18,11 +20,6 @@ (hide? #t) (path "/srv/git/marek/packages"))) -(define git-http-configuration - (gnu:services:version-control:git-http-configuration - (git-root "/var/lib/gitolite/repositories") - (uri-path "/git"))) - (define nginx-location-cgit (nginx-location-configuration (body (list "fastcgi_param HTTP_HOST $server_name ;" @@ -33,18 +30,16 @@ (uri "@cgit"))) (define nginx-server-cgit - (let - ((git-http- (gnu:services:version-control:git-http-nginx-location-configuration git-http-configuration))) - (nginx-server-configuration - (locations (list git-http- - nginx-location-cgit - deployment:services:web:nginx-location-well-known)) - (listen (list "192.168.10.2:443 ssl")) - (root gnu:packages:version-control:cgit) - (server-name (list "git.marekpasnikowski.pl")) - (ssl-certificate "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem") - (ssl-certificate-key "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem") - (try-files (list "$uri" "@cgit"))))) + (nginx-server-configuration + (locations (list deployment:services:version-control:aisaka-git-http-nginx-location + nginx-location-cgit + deployment:services:web:nginx-location-well-known)) + (listen (list "192.168.10.2:443 ssl")) + (root gnu:packages:version-control:cgit) + (server-name (list "git.marekpasnikowski.pl")) + (ssl-certificate "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem") + (ssl-certificate-key "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem") + (try-files (list "$uri" "@cgit")))) (define nginx-extension-of-cgit (service-extension deployment:services:web:nginx-service-type* diff --git a/deployment/services/version-control.scm b/deployment/services/version-control.scm new file mode 100644 index 0000000..6044e22 --- /dev/null +++ b/deployment/services/version-control.scm @@ -0,0 +1,16 @@ +;;; SPDX-License-Identifier: GPL-3.0-or-later +;;; SPDX-FileCopyrightText: 2024-2026 Marek Paśnikowski <marek@marekpasnikowski.pl> + +(define-module (deployment services version-control) + #:export (aisaka-git-http-nginx-location) + #:use-module (gnu services version-control)) + +(define aisaka-git-http-configuration + (git-http-configuration + (git-root "/var/lib/gitolite/repositories") + (uri-path "/git"))) + +(define-public aisaka-git-http-nginx-location + (git-http-nginx-location-configuration aisaka-git-http-configuration)) + +;;; EOF |