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

Renamed to .guix.metznet.ca, added qcow2 target back to makefile, and made vpn server

master
noah metz 2023-11-30 14:40:07 -07:00
parent 99adf5a794
commit 42eede695c
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
Unescape Escape View File

@ -2,9 +2,17 @@ NONGUIX_DIR ?= ~/Code/nonguix
GUIX_SUBSTITUTE_FLAG = --substitute-urls='https://ci.guix.gnu.org https://substitutes.nonguix.org' GUIX_SUBSTITUTE_FLAG = --substitute-urls='https://ci.guix.gnu.org https://substitutes.nonguix.org'
GUIX_LIB_FLAGS = -L ./ -L $(NONGUIX_DIR) GUIX_LIB_FLAGS = -L ./ -L $(NONGUIX_DIR)
LIBVIRT_GROUP ?= libvirt
LIBVIRT_USER ?= $(USER)
GUIX_IMAGE_CMD ?= guix system image $(GUIX_SUBSTITUTE_FLAG) --image-type=qcow2 $(GUIX_LIB_FLAGS)
VM_RAM ?= 4000 VM_RAM ?= 4000
VM_CPU ?= 4 VM_CPU ?= 4
machines/%.qcow2: machines/%.scm
$(eval RO := $(shell $(GUIX_IMAGE_CMD) $<))
install -C -m 666 -o $(LIBVIRT_USER) -g $(LIBVIRT_GROUP) $(RO) $@
.PHONY: machines/% .PHONY: machines/%
machines/%: machines/%.scm machines/%: machines/%.scm
$(eval VM_SCRIPT := $(shell guix system $(GUIX_LIB_FLAGS) $(GUIX_SUBSTITUTE_FLAG) vm $<)) $(eval VM_SCRIPT := $(shell guix system $(GUIX_LIB_FLAGS) $(GUIX_SUBSTITUTE_FLAG) vm $<))

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

@ -325,8 +325,7 @@ cryptography.")
(operating-system (operating-system
(inherit %metznet-base-server-system) (inherit %metznet-base-server-system)
(host-name "kerberos-guix.metznet.ca") (host-name "kerberos.guix.metznet.ca")
(packages (append (list mit-krb5-ldap) %metznet-base-packages))
(services (services
(append (list (service kdc-service-type (append (list (service kdc-service-type
(kdc-configuration (dbdefaults '("ldap_kerberos_container_dn = cn=kerberos,dc=metznet,dc=ca")) (kdc-configuration (dbdefaults '("ldap_kerberos_container_dn = cn=kerberos,dc=metznet,dc=ca"))
@ -354,5 +353,5 @@ cryptography.")
(certbot-configuration (email "admin@metznet.ca") (certbot-configuration (email "admin@metznet.ca")
(certificates (list (certificate-configuration (certificates (list (certificate-configuration
(domains ' (domains '
("ldap-guix.metznet.ca")))))))) ("kerberos.guix.metznet.ca"))))))))
%metznet-server-services))) %metznet-server-services)))

4
machines/ldap.metznet.ca.scm
Unescape Escape View File

@ -9,13 +9,13 @@
(operating-system (operating-system
(inherit %metznet-base-server-system) (inherit %metznet-base-server-system)
(host-name "ldap-guix.metznet.ca") (host-name "ldap.guix.metznet.ca")
(services (services
(append (list (service certbot-service-type (append (list (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 '
("ldap-guix.metznet.ca"))))))) ("ldap.guix.metznet.ca")))))))
(service slapd-service-type (service slapd-service-type
(slapd-configuration (uris (slapd-configuration (uris
"ldap:// ldapi:// ldaps:// ldapis://") "ldap:// ldapi:// ldaps:// ldapis://")

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

@ -0,0 +1,21 @@
(define-module (machines vpn.metznet.ca)
#:use-module (gnu system)
#:use-module (gnu services)
#:use-module (gnu services certbot)
#:use-module (gnu services vpn)
#:use-module (system base-system))
(operating-system
(inherit %metznet-base-server-system)
(host-name "vpn.guix.metznet.ca")
(services
(append (list (service openvpn-server-service-type
(openvpn-server-configuration
(server "10.0.80.0 255.255.255.0")))
(service certbot-service-type
(certbot-configuration (email "admin@metznet.ca")
(certificates (list (certificate-configuration
(domains '
("vpn.guix.metznet.ca"))))))))
(modify-services %metznet-server-services (delete openvpn-client-service-type)))))