From 504a409bd224a88fa98fbf86ff0a6bac3d4a111d Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Thu, 30 Dec 2021 10:20:02 -0400
Subject: fix(wpcarro/diogenes): Launch billandhiscomputer.com

These are now available at https://billandhiscomputer.com. I still need to
update the website copy and transfer wpcarro.dev over from Google Domains. I
think I prefer billandhiscomputer (username bill, bill_and_his_computer,
bill-and-his-computer, the_real_bill), so I may deprecate wpcarro. We'll see...

Change-Id: Ia7831ee4813e2cf639047d22d59d302a50e06e66
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4748
Tested-by: BuildkiteCI
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
---
 users/wpcarro/nixos/diogenes/default.nix | 103 +++++++++++++++----------------
 1 file changed, 51 insertions(+), 52 deletions(-)

(limited to 'users/wpcarro/nixos')

diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix
index 7cc6443a56..13fb046a24 100644
--- a/users/wpcarro/nixos/diogenes/default.nix
+++ b/users/wpcarro/nixos/diogenes/default.nix
@@ -18,7 +18,7 @@ in wpcarro.terraform.googleCloudVM {
     };
 
     resource.google_dns_record_set."${name}" = {
-      name = "${name}.${domainName}.";
+      name = "${domainName}.";
       type = "A";
       ttl = 300; # 5m
       managed_zone = "\${google_dns_managed_zone.${name}.name}";
@@ -92,57 +92,56 @@ in wpcarro.terraform.googleCloudVM {
       # };
 
       # TODO(wpcarro): Re-enable this after debugging ACME and NXDOMAIN.
-      # depot.quassel = {
-      #   enable = true;
-      #   acmeHost = domainName;
-      #   bindAddresses = [
-      #     "0.0.0.0"
-      #   ];
-      # };
-      #
-      # journaldriver = {
-      #   enable = true;
-      #   logStream = "home";
-      #   googleCloudProject = "wpcarros-infrastructure";
-      #   applicationCredentials = "/etc/gcp/key.json";
-      # };
-      #
-      #
-      # nginx = {
-      #   enable = true;
-      #   enableReload = true;
-      #
-      #   recommendedTlsSettings = true;
-      #   recommendedGzipSettings = true;
-      #   recommendedProxySettings = true;
-      #
-      #   # for journaldriver
-      #   commonHttpConfig = ''
-      #     log_format json_combined escape=json
-      #     '{'
-      #         '"remote_addr":"$remote_addr",'
-      #         '"method":"$request_method",'
-      #         '"host":"$host",'
-      #         '"uri":"$request_uri",'
-      #         '"status":$status,'
-      #         '"request_size":$request_length,'
-      #         '"response_size":$body_bytes_sent,'
-      #         '"response_time":$request_time,'
-      #         '"referrer":"$http_referer",'
-      #         '"user_agent":"$http_user_agent"'
-      #     '}';
-      #
-      #     access_log syslog:server=unix:/dev/log,nohostname json_combined;
-      #   '';
-      #
-      #   virtualHosts = {
-      #     "${domainName}" = {
-      #       addSSL = true;
-      #       enableACME = true;
-      #       root = wpcarro.website.root;
-      #     };
-      #   };
-      # };
+      depot.quassel = {
+        enable = true;
+        acmeHost = domainName;
+        bindAddresses = [
+          "0.0.0.0"
+        ];
+      };
+
+      journaldriver = {
+        enable = true;
+        logStream = "home";
+        googleCloudProject = "wpcarros-infrastructure";
+        applicationCredentials = "/etc/gcp/key.json";
+      };
+
+      nginx = {
+        enable = true;
+        enableReload = true;
+
+        recommendedTlsSettings = true;
+        recommendedGzipSettings = true;
+        recommendedProxySettings = true;
+
+        # for journaldriver
+        commonHttpConfig = ''
+          log_format json_combined escape=json
+          '{'
+              '"remote_addr":"$remote_addr",'
+              '"method":"$request_method",'
+              '"host":"$host",'
+              '"uri":"$request_uri",'
+              '"status":$status,'
+              '"request_size":$request_length,'
+              '"response_size":$body_bytes_sent,'
+              '"response_time":$request_time,'
+              '"referrer":"$http_referer",'
+              '"user_agent":"$http_user_agent"'
+          '}';
+
+          access_log syslog:server=unix:/dev/log,nohostname json_combined;
+        '';
+
+        virtualHosts = {
+          "${domainName}" = {
+            addSSL = true;
+            enableACME = true;
+            root = wpcarro.website.root;
+          };
+        };
+      };
     };
 
     system.stateVersion = "21.11";
-- 
cgit 1.4.1