diff options
| author | EuAndreh <eu@euandre.org> | 2024-11-19 10:58:03 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2024-11-19 10:58:03 -0300 |
| commit | a6fad19634afaad40b050dea61bf66a4ee9e9a29 (patch) | |
| tree | 0f44b369619738f3a1baf2278dad554c27520d03 | |
| parent | rm src/versions/status.papo.im.txt (diff) | |
| download | asami-a6fad19634afaad40b050dea61bf66a4ee9e9a29.tar.gz asami-a6fad19634afaad40b050dea61bf66a4ee9e9a29.tar.xz | |
system.scm: Add hsts-service-type
| -rw-r--r-- | src/guix/system.scm | 20 | ||||
| -rw-r--r-- | src/versions/hsts.txt | 1 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/guix/system.scm b/src/guix/system.scm index 5428d82..a2a0c31 100644 --- a/src/guix/system.scm +++ b/src/guix/system.scm @@ -65,6 +65,7 @@ (define package-records (list (latest pkg:binder) + (latest pkg:hsts) (latest pkg:glaze) (latest pkg:untls) (latest pkg:wscat) @@ -76,19 +77,23 @@ (pkg:with-services-from-args pkg:binder-service-type pkg:<binder-configuration>; FIXME: /var/run/glaze/redirect/glaze.socket, etc - '(((binder-http) ("0.0.0.0:80" "/var/run/glaze/redirect.socket")) + '(((binder-http) ("0.0.0.0:80" "/var/run/hsts/hsts.socket")) ((binder-https) ("0.0.0.0:443" "/var/run/untls/https.socket")) ((binder-ircs) ("0.0.0.0:6697" "/var/run/untls/ircs.socket"))))) +(define hsts-service-type + (pkg:with-services-from-args + pkg:hsts-service-type + pkg:<hsts-configuration> + '(((hsts) ("/var/run/hsts/hsts.socket"))))) + (define glaze-service-type (pkg:with-services-from-args pkg:glaze-service-type pkg:<glaze-configuration> - '(((glaze-http) ("-X" "/var/run/glaze/redirect.socket")) - ((glaze-https) ("-P/ws:/var/run/wscat/wscat.socket" - ;; -P/git/*:/var/run/fcgiwrap.sock" FIXME - "-P/*:/var/lib/glaze/" - "/var/run/glaze/glaze.socket"))))) + '(((glaze) ("-P/ws:/var/run/wscat/wscat.socket" + "-P/*:/var/www/" + "/var/run/glaze/glaze.socket"))))) (define certs (list +cert.pem+ +privkey.pem+)) (define untls-service-type @@ -141,6 +146,9 @@ (service binder-service-type (pkg:binder-configuration (package (latest pkg:binder)))) + (service hsts-service-type + (pkg:hsts-configuration + (package (latest pkg:hsts)))) (service glaze-service-type (pkg:glaze-configuration (package (latest pkg:glaze)))) diff --git a/src/versions/hsts.txt b/src/versions/hsts.txt new file mode 100644 index 0000000..832e647 --- /dev/null +++ b/src/versions/hsts.txt @@ -0,0 +1 @@ +a1a3cb15b9c7e8767d6baea90fcf1e7dbc1f5a7d |