diff --git a/Makefile.am b/Makefile.am index ef7e86c..d7e6344 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,7 @@ guix-commit.txt: Makefile s#VM_IPV4_GATEWAY#$(VM_IPV4_GATEWAY)#g ; \ s#VM_IPV6_GATEWAY#$(VM_IPV4_GATEWAY)#g ; \ s#VM_IPV4_DNS#$(VM_IPV4_DNS)#g ; \ + s#VM_IPV6_DNS#$(VM_IPV6_DNS)#g ; \ s#VM_SSH_PUB_KEY#$(VM_SSH_PUB_KEY)#g" $< > $@ %.sh: %.sh.tmpl guix-commit.txt Makefile diff --git a/configure.ac b/configure.ac index 915d2d7..20b92f4 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ AC_SUBST([VM_IPV6_ADDRESS], []) AC_SUBST([VM_IPV4_GATEWAY], []) AC_SUBST([VM_IPV6_GATEWAY], []) AC_SUBST([VM_IPV4_DNS], []) +AC_SUBST([VM_IPV6_DNS], []) AC_SUBST([VM_SSH_PUB_KEY], []) AC_ARG_WITH([domain], @@ -75,10 +76,15 @@ AC_ARG_WITH([vm-ipv4-dns], [VM_IPV4_DNS=$withval], [VM_IPV4_DNS="192.168.0.1"]) +AC_ARG_WITH([vm-ipv6-dns], + [AS_HELP_STRING([--with-vm-ipv6-dns=VM_IPV6_DNS], [Use custom VM + IPv6 dns address. (default=2001:910:1021::1)])], + [VM_IPV6_DNS=$withval], + [VM_IPV6_DNS="2001:910:1021::1"]) + AC_ARG_WITH([vm-ssh-public-key], [AS_HELP_STRING([--with-ssh-vm-public-key=VM_SSH_PUB_KEY], [Use custom VM SSH public key for use with 'guix deploy'. (default=\ - ssh-ed25519\ AAAAC3NzaC1lZDI1NTE5AAAAIEjLYbJ+47MTte960IbOUTRzOD012ewt1IZgOOc+NqDa)])], [VM_SSH_PUB_KEY=$withval], @@ -101,4 +107,5 @@ echo " DNS: $VM_IPV4_DNS" echo "- VM IPv6 settings:" echo " address: $VM_IPV6_ADDRESS" echo " gateway: $VM_IPV6_GATEWAY" +echo " DNS: $VM_IPV6_DNS" echo "- VM SSH public key: $VM_SSH_PUB_KEY" diff --git a/mumble-vm-system.scm.tmpl b/mumble-vm-system.scm.tmpl index 2d8a408..fe58eb8 100644 --- a/mumble-vm-system.scm.tmpl +++ b/mumble-vm-system.scm.tmpl @@ -197,7 +197,7 @@ https://DOMAIN/ (network-route (destination "default") (gateway "VM_IPV6_GATEWAY")))) - (name-servers '("VM_IPV4_DNS"))))) + (name-servers (list "VM_IPV4_DNS" "VM_IPV6_DNS"))))) ;; Nginx (service nginx-service-type