From 6d99b93f1a45cff91f369dc7c53bdc724d68d092 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Tue, 28 Jun 2022 10:32:41 -0700
Subject: feat(wpcarro/website): Support SSL certs for wpcarro.dev

This has been sloppy for awhile...

While I'm at it modularize some of my Nginx configuration.

Side note: might be time to decouple the Terraform provisioning stuffs from the
NixOS configuration, and this feels *too* tightly coupled.

Change-Id: Ida0da5462d938b956571321a67ba1f026fb0a7de
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5902
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI
---
 users/wpcarro/nixos/diogenes/default.nix | 44 +++++---------------------------
 1 file changed, 7 insertions(+), 37 deletions(-)

(limited to 'users/wpcarro/nixos/diogenes/default.nix')

diff --git a/users/wpcarro/nixos/diogenes/default.nix b/users/wpcarro/nixos/diogenes/default.nix
index 022570e3d3..e83329e4c2 100644
--- a/users/wpcarro/nixos/diogenes/default.nix
+++ b/users/wpcarro/nixos/diogenes/default.nix
@@ -4,6 +4,9 @@ let
   inherit (depot.users) wpcarro;
   name = "diogenes";
   domainName = "billandhiscomputer.com";
+
+  mod = name: depot.path.origSrc + ("/ops/modules/" + name);
+  usermod = name: depot.path.origSrc + ("/users/wpcarro/nixos/modules/" + name);
 in
 wpcarro.terraform.googleCloudVM {
   project = "wpcarros-infrastructure";
@@ -36,7 +39,10 @@ wpcarro.terraform.googleCloudVM {
 
   configuration = {
     imports = [
-      (depot.path.origSrc + "/ops/modules/quassel.nix")
+      (mod "quassel.nix")
+      (usermod "nginx.nix")
+      (usermod "www/billandhiscomputer.com.nix")
+      (usermod "www/wpcarro.dev.nix")
     ];
 
     networking = {
@@ -117,42 +123,6 @@ wpcarro.terraform.googleCloudVM {
         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