MetzNet
/
metznet-channel
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed vpn

master
noah metz 2023-11-30 16:24:50 -07:00
parent 42eede695c
commit cfb8ade09f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
machines/vpn.metznet.ca.scm
Unescape Escape View File

@ -7,15 +7,16 @@
(operating-system (operating-system
(inherit %metznet-base-server-system) (inherit %metznet-base-server-system)
(host-name "vpn.guix.metznet.ca") (host-name "vpn.metznet.ca")
(services (services
(append (list (service openvpn-server-service-type (append (list (service openvpn-server-service-type
(openvpn-server-configuration (openvpn-server-configuration
(tls-auth "/etc/openvpn/ta.key")
(server "10.0.80.0 255.255.255.0"))) (server "10.0.80.0 255.255.255.0")))
(service certbot-service-type (service certbot-service-type
(certbot-configuration (email "admin@metznet.ca") (certbot-configuration (email "admin@metznet.ca")
(certificates (list (certificate-configuration (certificates (list (certificate-configuration
(domains ' (domains '
("vpn.guix.metznet.ca")))))))) ("vpn.metznet.ca"))))))))
(modify-services %metznet-server-services (delete openvpn-client-service-type))))) (modify-services %metznet-server-services (delete openvpn-client-service-type)))))

7
system/base-system.scm
Unescape Escape View File

@ -172,7 +172,10 @@
(symlink (string-append #$zsh "/bin/zsh") "/bin/zsh")))) (symlink (string-append #$zsh "/bin/zsh") "/bin/zsh"))))
(define (metznet-etc-service configuration) (define (metznet-etc-service configuration)
'()) '(("/etc/openvpn/ta.key" (local-file "ta.key"))
("/etc/openvpn/ca.crt" (local-file "ca.crt"))
("/etc/openvpn/client.crt" (local-file "client.crt"))
("/etc/openvpn/client.key" (local-file "client.key"))))
(define metznet-service-type (define metznet-service-type
(service-type (name 'metznet-service) (service-type (name 'metznet-service)
@ -251,6 +254,8 @@
(pid-file (pid-file
"/var/run/openvpn/client.pid") "/var/run/openvpn/client.pid")
(persist-key? #f) (persist-key? #f)
(remote (list (openvpn-remote-configuration
(name "vpn.metznet.ca"))))
(tls-auth (tls-auth
"/etc/openvpn/ta.key")))) "/etc/openvpn/ta.key"))))
(modify-services %base-services (modify-services %base-services