From 8456d87b08ec9f552892bd70688a9e8ad7a776b7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 19 Feb 2021 11:24:54 -0300 Subject: Update aux/guix/pinned-channels.scm --- aux/guix/pinned-channels.scm | 9 ++++----- vps.scm | 13 +++---------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/aux/guix/pinned-channels.scm b/aux/guix/pinned-channels.scm index c01ebde..8a09825 100644 --- a/aux/guix/pinned-channels.scm +++ b/aux/guix/pinned-channels.scm @@ -1,11 +1,11 @@ (list (channel - (name 'euandreh) - (url "git://git.euandreh.xyz/euandreh-guix-channel") - (branch "master") + (name 'xyz-euandreh) + (url "git://git.euandreh.xyz/package-repository") + (branch "main") (introduction (make-channel-introduction - "641f9388002cd874040938ab1c6da7ac9d0e54ca" + "d749e053e6db365069cb9b2ef47a78b06f9e7361" (openpgp-fingerprint "5BDA E9B8 B2F6 C6BC BB0D 6CE5 81F9 0EC3 CD35 6060")))) (channel @@ -18,4 +18,3 @@ "9edb3f66fd807b096b48283debdcddccfea34bad" (openpgp-fingerprint "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))) - diff --git a/vps.scm b/vps.scm index 7fccbf6..96b7e4f 100644 --- a/vps.scm +++ b/vps.scm @@ -164,9 +164,6 @@ (define git-domain-prefix "git") (define git-domain (string-append git-domain-prefix "." tld)) -(define ci-domain-prefix "ci") -(define ci-domain (string-append ci-domain-prefix "." tld)) - ;; OS configuration @@ -200,7 +197,6 @@ pki " mail-domain " key \"" (tls-priv-for mail-domain) "\""))) (define tls-prefixes (list mail-domain-prefix - ci-domain-prefix git-domain-prefix "chat")) @@ -285,10 +281,8 @@ pki " mail-domain " key \"" (tls-priv-for mail-domain) "\""))) (service nginx-service-type (nginx-configuration (server-blocks - (append - (list - (static-nginx-config (list ci-domain) "/srv/ci")) - static-projects-nginx-config)))) + (append (list) + static-projects-nginx-config)))) (service certbot-service-type (certbot-configuration (email (string-append certbot-alias "@" tld)) @@ -343,8 +337,7 @@ pki " mail-domain " key \"" (tls-priv-for mail-domain) "\""))) (mkdir-p p) (chmod p #o755)) '("/srv/http" - "/srv/git" - "/srv/ci")))) + "/srv/git")))) (modify-services %base-services (guix-service-type -- cgit v1.2.3