Fix user-vms build

acmcsufoss · May 7, 2024 · 090915b · 090915b
1 parent a60571c
commit 090915b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/servers/cs306/user-vms/default.nix b/servers/cs306/user-vms/default.nix
@@ -82,12 +82,14 @@ in
 			}
 		'';
 		"http://*.vps.acmcsuf.com" =
-			(lib.concatStrings (lib.imap0 (i: user: ''
-				@user${i} <<CEL
+			with lib;
+			with builtins;
+			(concatStrings (imap0 (i: user: ''
+				@user_${toString i} <<CEL
 					{host} == "${user.sanitized_id}.vps.acmcsuf.com" ||
 					{host}.endsWith(".${user.sanitized_id}.vps.acmcsuf.com")
 					CEL
-				handle @user${i} {
+				handle @user_${toString i} {
 					reverse_proxy * http://${user.ip}:80
 				}
 			'') config.acm.user-vms.usersInfo)) +

diff --git a/servers/cs306/user-vms/vps.html b/servers/cs306/user-vms/vps.html
@@ -52,7 +52,7 @@ <h2>Users</h2>
       <ul class="users-info-list">
         <li class="url">
           <b>Website URL:</b>
-          {{ $url := ($user.sanitized_id | printf "%s.vps.acmcsuf.com") }}
+          {{ $url := ($info.sanitized_id | printf "%s.vps.acmcsuf.com") }}
           <a href="https://{{ $url }}" target="_blank">{{ $url }}</a>
         </li>
         <li class="discord">

diff --git a/user-machines/vm/default.nix b/user-machines/vm/default.nix
@@ -140,7 +140,7 @@ in
 		acm.user-vms.usersInfo = imap0 (i: user: {
 			id = user.id;
 			ip = ips.ipFromOffset i;
-			sanitized_id = lib.toLower (builtins.replaceStrings ["."] ["_"] user.id);
+			sanitized_id = toLower (replaceStrings ["."] ["_"] user.id);
 		}) self.users;
 
 		virtualisation.libvirt.enable = true;