diff options
| -rw-r--r-- | src/org/euandre/packages.scm | 48 | ||||
| -rw-r--r-- | tests/internet/system.scm | 10 |
2 files changed, 50 insertions, 8 deletions
diff --git a/src/org/euandre/packages.scm b/src/org/euandre/packages.scm index 4c5c6a7..7cc7755 100644 --- a/src/org/euandre/packages.scm +++ b/src/org/euandre/packages.scm @@ -67,6 +67,24 @@ glaze-configuration-listen-socket glaze-configuration-upstream-socket + <hsts-configuration> + hsts-configuration + make-hsts-configuration + hsts-configuration? + hsts-configuration-name + hsts-configuration-package + hsts-configuration-user + hsts-configuration-group + hsts-configuration-log-file + hsts-configuration-data-directory + hsts-configuration-run-directory + hsts-configuration-run-in-container? + hsts-configuration-container-name + hsts-configuration-extra-mappings + hsts-configuration-options + hsts-configuration-listen-socket + hsts-configuration-upstream-socket + <untls-configuration> untls-configuration make-untls-configuration @@ -354,6 +372,14 @@ "ad8c95cc5df4b5c10cd23dacf60b9c57b59c7e52" "05qa4pyj3dqxg0gdx0jg4rhh64pi63x0liw26k7d3bm8f8a9b1rc")) +(define-public hsts + (gopkg + "hsts" + (append (format-inputs (list guuid gobang)) + (normalize-inputs '())) + "a1a3cb15b9c7e8767d6baea90fcf1e7dbc1f5a7d" + "0pw8ghsk4ifrf9mrmw43b61c06q25i9irnl219rchlg3qvj87avl")) + (define-public untls (gopkg "untls" @@ -759,6 +785,24 @@ root ALL=(ALL) ALL (listen-socket glaze-configuration-listen-socket (default "/var/run/glaze/glaze.socket")) (upstream-socket glaze-configuration-upstream-socket (default #f))) +(define-record-type* <hsts-configuration> + hsts-configuration + make-hsts-configuration + hsts-configuration? + (name hsts-configuration-name (default "hsts")) + (package hsts-configuration-package (default hsts)) + (user hsts-configuration-user (default "hsts")) + (group hsts-configuration-group (default "hsts")) + (log-file hsts-configuration-log-file (default "/var/log/hsts/hsts.log")) + (data-directory hsts-configuration-data-directory (default #f)) + (run-directory hsts-configuration-run-directory (default "/var/run/hsts")) + (run-in-container? hsts-configuration-run-in-container? (default #t)) + (container-name hsts-configuration-container-name (default "hsts-container")) + (extra-mappings hsts-configuration-extra-mappings (default '())) + (options hsts-configuration-options (default '())) + (listen-socket hsts-configuration-listen-socket (default "/var/run/hsts/hsts.socket")) + (upstream-socket hsts-configuration-upstream-socket (default #f))) + (define-record-type* <untls-configuration> untls-configuration make-untls-configuration @@ -965,6 +1009,9 @@ The default configuration should provide sane values for all of these." (define-public glaze-service-type (service-type-for 'glaze <glaze-configuration> (glaze-configuration) '())) +(define-public hsts-service-type + (service-type-for 'hsts <hsts-configuration> (hsts-configuration) '())) + (define-public untls-service-type (service-type-for 'untls <untls-configuration> (untls-configuration) '())) @@ -989,6 +1036,7 @@ The default configuration should provide sane values for all of these." golite binder glaze + hsts untls wscat fiinha diff --git a/tests/internet/system.scm b/tests/internet/system.scm index a8394e4..192f500 100644 --- a/tests/internet/system.scm +++ b/tests/internet/system.scm @@ -20,13 +20,6 @@ `(("user1" "I'm a user" ()) ("another" "Description" ("wheel") ,(path "tests/internet/key.txt")))) -(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/*:/var/lib/glaze" "/var/run/glaze/glaze.socket"))))) - (define-public papod-service-type (pkg:service-type-for 'papod papo:<papod-configuration> @@ -46,7 +39,8 @@ (service dhcp-client-service-type) (service fail2ban-service-type) (service pkg:binder-service-type) - (service glaze-service-type) + (service pkg:glaze-service-type) + (service pkg:hsts-service-type) (service pkg:untls-service-type) (service pkg:wscat-service-type) (service papod-service-type) |