From 6b289b7bf09185b38cac6a5e752387cbf5aae91d Mon Sep 17 00:00:00 2001 From: Jean-Francois GUILLAUME Date: Tue, 16 Apr 2024 13:52:44 +0000 Subject: [PATCH] Revert "adding dirty forgejo package and a forgejo service" This reverts merge request !384 --- glicid/packages/forgejo.scm | 42 -------------------- glicid/services/forgejo.scm | 79 ------------------------------------- 2 files changed, 121 deletions(-) delete mode 100644 glicid/packages/forgejo.scm delete mode 100644 glicid/services/forgejo.scm diff --git a/glicid/packages/forgejo.scm b/glicid/packages/forgejo.scm deleted file mode 100644 index 0f05bd2..0000000 --- a/glicid/packages/forgejo.scm +++ /dev/null @@ -1,42 +0,0 @@ -(define-module (glicid packages forgejo) - #:use-module (guix) - #:use-module (ice-9 match) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix utils) - #:use-module (guix download) - #:use-module (guix packages) - #:use-module (guix build-system trivial) - #:use-module (gnu packages bash) - #:use-module (gnu packages version-control)) - -(define-public forgejo-dirty - (package - (name "forgejo") - (version "1.21.10-0") - (source (origin - (method url-fetch) - (uri (string-append "https://codeberg.org/" name "/" name "/releases/download/v" version "/" name "-" version "-linux-amd64")) - (file-name (string-append name "-" version "-linux-amd64")) - (sha256 (base32 "1vkp2aipb5d1q4s77dhdwnj66ih3rvbx1bb3fgkvsknyhb1l8mna")))) - (build-system trivial-build-system) - (arguments - '(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils)) - (let* ((source (assoc-ref %build-inputs "source")) - (out (assoc-ref %outputs "out")) - (install-dir (string-append out "/bin")) - (executable (string-append install-dir "/forgejo")) - (bash (string-append (assoc-ref %build-inputs "bash") "/bin/")) - (git-dir (string-append (assoc-ref %build-inputs "git") "/bin/"))) - (setenv "PATH" (string-append (getenv "PATH") ":" bash)) - (mkdir-p install-dir) - (copy-file source executable) - (chmod executable #o755) - (wrap-program executable `("PATH" ":" prefix (,git-dir))))))) - (inputs (list git bash)) - (synopsis "Forgejo binary release") - (description - "Forgejo is a self-hosted lightweight software forge. Easy to install and low maintenance, it just does the job.") - (home-page "https://forgejo.org/") - (license license:expat))) diff --git a/glicid/services/forgejo.scm b/glicid/services/forgejo.scm deleted file mode 100644 index 4cccba0..0000000 --- a/glicid/services/forgejo.scm +++ /dev/null @@ -1,79 +0,0 @@ -(define-module (glicid services forgejo) - #:use-module (glicid packages forgejo) - #:use-module (gnu services) - #:use-module (gnu services shepherd) - #:use-module (gnu system shadow) - #:use-module (gnu system pam) - #:use-module (gnu packages admin) - #:use-module (gnu packages base) - #:use-module (gnu packages certs) - #:use-module (gnu packages version-control) - #:use-module (guix gexp) - #:use-module (guix modules) - #:use-module (guix records) - #:use-module (ice-9 match) - #:export (forgejo-configuration - forgejo-configuration? - forgejo-service - forgejo-service-type - %forgejo-account - %forgejo-group - %forgejo-accounts)) - -(define %forgejo-group - (user-group - (name "forgejo") - (system? #t))) - -(define %forgejo-account - (user-account - (name "forgejo") - (group "forgejo") - (system? #t) - (comment "forgejo server user") - (home-directory "/var/lib/forgejo") - (shell (file-append bash "/bin/bash")))) - -(define %forgejo-accounts - (list %forgejo-group %forgejo-account)) - -(define-record-type* forgejo-configuration - make-forgejo-configuration - forgejo-configuration? - (forgejo forgejo (default forgejo)) - (forgejo-conf forgejo-conf (default "/etc/forgejo/app.ini")) - (log-file log-file (default "/var/log/forgejo.log"))) - -(define %forgejo-activation - #~(begin - (mkdir-p "/etc/forgejo") - (touch "/etc/forgejo/app.ini") - (touch "/var/log/forgejo.log") - (chown "/etc/forgejo" (passwd:uid "forgejo") (passwd:gid "forgejo")) - (chown "/etc/forgejo/app.ini" (passwd:uid "forgejo") (passwd:gid "forgejo")) - (chown "/var/log/forgejo.log" (passwd:uid "forgejo") (passwd:gid "forgejo")) - #t)) - - -(define forgejo-service - (match-lambda - (($ forgejo forgejo-conf log-file) - (list (shepherd-service (provision '(forgejo)) - (documentation "Run forgejo.") - (requirement '(user-processes)) - (respawn? #t) - (start #~(make-forkexec-constructor (list #$(file-append forgejo "/bin/forgejo") - "web" - "--config" forgejo-conf) - #:log-file #$log-file - #:user (passwd:uid (getpwnam "forgejo")) - #:group (passwd:gid (getpwnam "forgejo")))) - (stop #~(make-kill-destructor))))))) - -(define forgejo-service-type - (service-type (name 'forgejo) - (extensions (list (service-extension shepherd-root-service-type forgejo-service) - (service-extension activation-service-type (const %forgejo-activation)) - (service-extension account-service-type (const %forgejo-accounts)))) - (description "Run forgejo") - ))