From 2c30a80c746f08115ed746adb6131cf3044f31b7 Mon Sep 17 00:00:00 2001
From: jcolebrand <jcolebrand@gmail.com>
Date: Sun, 5 Nov 2023 14:42:13 -0800
Subject: [PATCH] make certbot work, fixup file capture

---
 capture.filelist | 66 +++---------------------------------------------
 certbot.ps1      |  4 +--
 2 files changed, 5 insertions(+), 65 deletions(-)

diff --git a/capture.filelist b/capture.filelist
index 29d468e..633da5b 100644
--- a/capture.filelist
+++ b/capture.filelist
@@ -88,80 +88,20 @@
 /etc/authselect/smartcard-auth
 /etc/authselect/system-auth
 /etc/openldap/ldap.conf
-/etc/openldap/certs/cert.pem
-/etc/openldap/certs/cert.pem-0
-/etc/openldap/certs/chain.pem
-/etc/openldap/certs/chain.pem-0
-/etc/openldap/certs/chain.pem-1
-/etc/openldap/certs/fullchain.pem
-/etc/openldap/certs/fullchain.pem-0
-/etc/openldap/certs/fullchain.pem-1
-/etc/openldap/certs/fullchain.pem-2
-/etc/openldap/certs/privkey.pem
-/etc/openldap/certs/README
+/etc/openldap/certs/*
 /etc/openldap/schema/kerberos.schema
 /etc/openldap/schema/samba.schema
 /etc/tmpfiles.d/dirsrv-medusa.conf
 /etc/sssd/sssd.conf
 /etc/dhcp/dhclient.conf
 /etc/gssproxy/24-nfs-server.conf
-/etc/letsencrypt/options-ssl-apache.conf
-/etc/letsencrypt/options-ssl-nginx.conf
-/etc/letsencrypt/ssl-dhparams.pem
-/etc/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/aa64898d65ae7d0e84c1a1a26d40dbc5/meta.json
-/etc/letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org/directory/aa64898d65ae7d0e84c1a1a26d40dbc5/regr.json
-/etc/letsencrypt/renewal/medusa.jcolebrand.info.conf
-/etc/letsencrypt/keys/0002_key-certbot.pem
-/etc/letsencrypt/keys/0003_key-certbot.pem
-/etc/letsencrypt/keys/0004_key-certbot.pem
-/etc/letsencrypt/keys/0005_key-certbot.pem
-/etc/letsencrypt/keys/0006_key-certbot.pem
-/etc/letsencrypt/keys/0007_key-certbot.pem
-/etc/letsencrypt/keys/0008_key-certbot.pem
-/etc/letsencrypt/keys/0009_key-certbot.pem
-/etc/letsencrypt/keys/0010_key-certbot.pem
-/etc/letsencrypt/keys/0011_key-certbot.pem
-/etc/letsencrypt/keys/0012_key-certbot.pem
-/etc/letsencrypt/keys/0013_key-certbot.pem
-/etc/letsencrypt/keys/0014_key-certbot.pem
-/etc/letsencrypt/keys/0015_key-certbot.pem
-/etc/letsencrypt/keys/0016_key-certbot.pem
-/etc/letsencrypt/csr/0002_csr-certbot.pem
-/etc/letsencrypt/csr/0003_csr-certbot.pem
-/etc/letsencrypt/csr/0004_csr-certbot.pem
-/etc/letsencrypt/csr/0005_csr-certbot.pem
-/etc/letsencrypt/csr/0006_csr-certbot.pem
-/etc/letsencrypt/csr/0007_csr-certbot.pem
-/etc/letsencrypt/csr/0008_csr-certbot.pem
-/etc/letsencrypt/csr/0009_csr-certbot.pem
-/etc/letsencrypt/csr/0010_csr-certbot.pem
-/etc/letsencrypt/csr/0011_csr-certbot.pem
-/etc/letsencrypt/csr/0012_csr-certbot.pem
-/etc/letsencrypt/csr/0013_csr-certbot.pem
-/etc/letsencrypt/csr/0014_csr-certbot.pem
-/etc/letsencrypt/csr/0015_csr-certbot.pem
-/etc/letsencrypt/csr/0016_csr-certbot.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/cert4.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/cert5.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/chain4.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/chain5.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/fullchain4.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/fullchain5.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/privkey4.pem
-/etc/letsencrypt/archive/medusa.jcolebrand.info/privkey5.pem
-/etc/letsencrypt/live/medusa.jcolebrand.info/cert.pem-0
-/etc/letsencrypt/live/medusa.jcolebrand.info/chain.pem-0
-/etc/letsencrypt/live/medusa.jcolebrand.info/chain.pem-1
-/etc/letsencrypt/live/medusa.jcolebrand.info/fullchain.pem-0
-/etc/letsencrypt/live/medusa.jcolebrand.info/fullchain.pem-1
-/etc/letsencrypt/live/medusa.jcolebrand.info/fullchain.pem-2
+/etc/letsencrypt/*
 /etc/secrets/krb5-ldap.pass
 /etc/zfs/vdev_id.conf.alias.example
 /etc/zfs/vdev_id.conf.multipath.example
 /etc/zfs/vdev_id.conf.sas_direct.example
 /etc/zfs/vdev_id.conf.sas_switch.example
 /etc/zfs/vdev_id.conf.scsi.example
-/etc/zfs/zpool.cache
 /etc/zfs/zed.d/zed-functions.sh
 /etc/zfs/zed.d/zed.rc
 /etc/dirsrv/config/certmap.conf
@@ -214,4 +154,4 @@
 /database/pgsql/ldap2pg.verbose
 /database/pgsql/data/pg_hba.conf
 /database/pgsql/data/postgresql.conf
-/root/*.*
\ No newline at end of file
+/root/*.*
diff --git a/certbot.ps1 b/certbot.ps1
index 16f823b..cbbc5bc 100644
--- a/certbot.ps1
+++ b/certbot.ps1
@@ -2,7 +2,8 @@ Set-Location /etc/letsencrypt
 
 Write-Host "-- running certbot command"
 
-export AWS_CONFIG_FILE=/var/lib/letsencrypt/aws/AWS_CONFIG;certbot certonly --dns-route53 --dns-route53-propagation-seconds 30 -d *.jcolebrand.info,jcolebrand.info
+[System.Environment]::SetEnvironmentVariable("AWS_CONFIG_FILE", "/var/lib/letsencrypt/aws/AWS_CONFIG")
+certbot certonly --dns-route53 --dns-route53-propagation-seconds 30 -d *.jcolebrand.info,jcolebrand.info
 
 Write-Host "-- Writing to jellyfin"
 
@@ -27,4 +28,3 @@ systemctl restart jellyfin.service
 systemctl restart dirsrv@medusa
 
 systemctl restart nginx
-