diff options
Diffstat (limited to '')
| -rw-r--r-- | src/org/euandre/queue.scm | 185 |
1 files changed, 91 insertions, 94 deletions
diff --git a/src/org/euandre/queue.scm b/src/org/euandre/queue.scm index ce5fdec..c0189c4 100644 --- a/src/org/euandre/queue.scm +++ b/src/org/euandre/queue.scm @@ -7,41 +7,12 @@ #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) - #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix least-authority) #:use-module (guix packages) #:use-module (guix records) #:use-module (guix utils) #:use-module (gnu) - #:use-module (gnu packages admin) - #:use-module (gnu packages check) - #:use-module (gnu packages cpio) - #:use-module (gnu packages cups) - #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages dbm) - #:use-module (gnu packages image) - #:use-module (gnu packages glib) - #:use-module (gnu packages gnome) - #:use-module (gnu packages golang) - #:use-module (gnu packages mail) - #:use-module (gnu packages m4) - #:use-module (gnu packages onc-rpc) - #:use-module (gnu packages package-management) - #:use-module (gnu packages perl) - #:use-module (gnu packages python-build) - #:use-module (gnu packages python-crypto) - #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz) - #:use-module (gnu packages time) - #:use-module (gnu packages tls) - #:use-module (gnu packages version-control) - #:use-module (gnu packages xml) - #:use-module (gnu services certbot) - #:use-module (gnu services cgit) - #:use-module (gnu services mail) - #:use-module (gnu services shepherd) - #:use-module (gnu services web) #:use-module (gnu system setuid) #:export (<shadow-group-configuration> shadow-group-configuration @@ -184,10 +155,32 @@ dovecot-accounts dovecot-activation dovecot-shepherd-service - dovecot-service-type - - - cgit-pre-configuration)) + dovecot-service-type)) +(use-package-modules + admin + check + cyrus-sasl + dbm + golang + m4 + mail + onc-rpc + perl + python-build + python-crypto + python-web + python-xyz + ssh + time + tls + version-control) +(use-service-modules + certbot + cgit + mail + shepherd + ssh + web) @@ -379,7 +372,7 @@ information on a large group of binary files.") (home-page "https://distfiles.gentoo.org/distfiles/pax-utils-1.3.7.tar.xz") (license license:gpl2))) -(define-public (hunspell-dictionary-utf8 dict-name) +(define (hunspell-dictionary-utf8 dict-name) (package (name (string-append "hunspell-dict-" dict-name "-utf8")) (version "630b34e6f8f3cbe7aa7b27b6d8ab118e27252fd1") @@ -421,7 +414,7 @@ information on a large group of binary files.") (define-public hunspell-dict-eo-utf8 (hunspell-dictionary-utf8 "eo")) (define-public hunspell-dict-es-utf8 (hunspell-dictionary-utf8 "es")) -(define-public python-pytest-tornado5 +(define python-pytest-tornado5 (package (name "python-pytest-tornado5") (version "2.0.0") @@ -442,26 +435,7 @@ information on a large group of binary files.") simplify testing of asynchronous tornado applications.") (license license:asl2.0))) -;; FIXME -#; -(define-public python-futures - (package - (name "python-futures") - (version "3.3.0") - (source - (origin - (method url-fetch) - (uri - (pypi-uri "futures" version)) - (sha256 - (base32 "154pvaybk9ncyb1wpcnzgd7ayvvhhzk92ynsas7gadaydbvkl0vy")))) - (build-system python-build-system) - (home-page "https://github.com/agronholm/pythonfutures") - (synopsis "Backport of the concurrent.futures package from Python 3") - (description "Backport of the concurrent.futures package from Python 3") - (license #f))) - -(define-public python-ordereddict +(define python-ordereddict (package (name "python-ordereddict") (version "1.1") @@ -484,7 +458,7 @@ simplify testing of asynchronous tornado applications.") collections.OrderedDict that works in Python 2.4-2.6.") (license #f))) -(define-public python-funcsigs +(define python-funcsigs (package (name "python-funcsigs") (version "1.0.2") @@ -507,7 +481,7 @@ collections.OrderedDict that works in Python 2.4-2.6.") "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+") (license #f))) -(define-public python-apscheduler +(define python-apscheduler (package (name "python-apscheduler") (version "3.9.1") @@ -553,10 +527,11 @@ collections.OrderedDict that works in Python 2.4-2.6.") (base32 "1rbdyr1f9mndlh83in47k8if65yp9n1dy4px2wipbf0qyjv5zxfs")))) (build-system python-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'sanity-check)))) + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'sanity-check)))) (native-inputs (list python-apscheduler)) (propagated-inputs @@ -937,7 +912,7 @@ keyfile ~a/private.key #~(lambda _ (format #t "~a~%" #$config-file))))))))))) -(define-public dkimproxyout-service-type +(define dkimproxyout-service-type (service-type (name 'dkimproxyout) (extensions @@ -1137,6 +1112,10 @@ setgid_group = ~a header_checks = regexp:{ { /^Received:.*/ IGNORE }, { /^X-Originating-IP:.*/ IGNORE } } mail_spool_directory = ~a + +message_size_limit = 102400000 +mailbox_size_limit = 5120000000 + ~a~a" queue-directory @@ -1673,33 +1652,6 @@ as-is, it creates a Dovecot server that and serve and authenticate IMAP connections correctly."))) -(define cgit-pre-configuration - (cgit-configuration - (nginx '()) - (source-filter (file-append cgit "/lib/cgit/filters/syntax-highlighting.py")) - (about-filter (file-append cgit "/lib/cgit/filters/about-formatting.sh")) - (virtual-root "/git/") - (remove-suffix? #t) - (nocache? #t) - (enable-commit-graph? #t) - (enable-follow-links? #t) - (enable-index-links? #t) - (enable-index-owner? #f) - (enable-log-filecount? #t) - (enable-log-linecount? #t) - (enable-remote-branches? #t) - (enable-subject-links? #t) - (snapshots '("tar.gz" "tar.xz")) - (root-desc "Patches welcome!") - (root-title (string-append (gethostname) " repositories")) - (logo "/git/static/cgit.png") - (favicon "/git/static/favicon.ico") - (css "/git/static/cgit.css") - (extra-options - '("enable-blame=1" - "readme=:README.md" - "readme=:README")))) - (define setenvfmt "Environment variable `~a' set to `~a'.~%") (define-public go-full @@ -1733,17 +1685,62 @@ connections correctly."))) (string-append #$output "/lib/go/pkg")))) (delete 'strip))))))) +(define-public cgit-pre-configuration + (cgit-configuration + (nginx '()) + (source-filter (file-append cgit "/lib/cgit/filters/syntax-highlighting.py")) + (about-filter (file-append cgit "/lib/cgit/filters/about-formatting.sh")) + (virtual-root "/git/") + (remove-suffix? #t) + (nocache? #t) + (enable-commit-graph? #t) + (enable-follow-links? #t) + (enable-index-links? #t) + (enable-index-owner? #f) + (enable-log-filecount? #t) + (enable-log-linecount? #t) + (enable-remote-branches? #t) + (enable-subject-links? #t) + (snapshots '("tar.gz" "tar.xz")) + (root-desc "Patches welcome!") + (root-title (string-append (gethostname) " repositories")) + (logo "/git/static/cgit.png") + (favicon "/git/static/favicon.ico") + (css "/git/static/cgit.css") + (extra-options + '("enable-blame=1" + "readme=:README.md" + "readme=:README")))) + +(define-public (tld-certbot-configuration tld) + (certbot-configuration + (email (string-append "root@" tld)) + (certificates + (list + (certificate-configuration + (domains (list tld))))))) ;; FIXME: SIGHUP nginx/untls + +(define-public (openssh-default-configuration authorized-keys) + (openssh-configuration + (openssh openssh-sans-x) + (password-authentication? #f) + (authorized-keys authorized-keys) + (extra-content "MaxSessions 20 +ClientAliveInterval 30 +ClientAliveCountMax 23 +SetEnv GIT_CONFIG_GLOBAL=/etc/gitconfig"))) + (list - go-full + postfix + mailutils-sendmail + rottlog-mailutils-sendmail pax-utils hunspell-dict-en-utf8 hunspell-dict-pt-utf8 hunspell-dict-fr-utf8 hunspell-dict-eo-utf8 hunspell-dict-es-utf8 - mailutils-sendmail - rottlog-mailutils-sendmail - postfix - python-telegram-bot) + python-telegram-bot + go-full) |