From 3a0b7314e141f9d5dc75421efd4ba9aa3ce7743c Mon Sep 17 00:00:00 2001 From: Lauren Lagarde Date: Sat, 23 Aug 2025 18:08:26 -0500 Subject: [PATCH] Scripts and some refactoring --- dotspace/configuration.nix | 15 +-------------- dotspace/parts/pki.nix | 15 +++++++++++++++ remote-system.sh | 8 ++++++++ systems/bastion/configuration.nix | 3 +++ 4 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 dotspace/parts/pki.nix create mode 100755 remote-system.sh diff --git a/dotspace/configuration.nix b/dotspace/configuration.nix index c3d7709..d5da51b 100644 --- a/dotspace/configuration.nix +++ b/dotspace/configuration.nix @@ -1,20 +1,7 @@ { ... }: { - security.pki.certificates = ['' - -----BEGIN CERTIFICATE----- - MIIBqzCCAVGgAwIBAgIQRC/rocbzjexwYz5mWw/YYDAKBggqhkjOPQQDAjA0MRQw - EgYDVQQKDAtEb3RzcGFjZV92MTEcMBoGA1UEAwwTRG90c3BhY2VfdjEgUm9vdCBD - QTAeFw0yNDEwMTgxNjI4NDRaFw0zNDEwMTYxNjI4NDRaMDQxFDASBgNVBAoMC0Rv - dHNwYWNlX3YxMRwwGgYDVQQDDBNEb3RzcGFjZV92MSBSb290IENBMFkwEwYHKoZI - zj0CAQYIKoZIzj0DAQcDQgAEJA1QxB0h6Hvp/0sjxZ+wedEaC0v8ODGb7TOQFNOR - vutG6AeH8F5yRuFmpUjTIXB6nfCn7Ruu1BjL6tjvcAgULqNFMEMwDgYDVR0PAQH/ - BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFPzRcD8OgMChBACO - jN+KyAth49ZjMAoGCCqGSM49BAMCA0gAMEUCIAy+GTFir9N8Xldw0YjQIRZOrM81 - mbpG5txU7FzqEOc0AiEA28/SOnR7hSQEslzfeiDbVk1FCIi9AL64cqv1J+0iJc8= - -----END CERTIFICATE----- - '']; - imports = [ ./parts/cifs.nix + ./parts/pki.nix ./parts/tinc.nix ]; } diff --git a/dotspace/parts/pki.nix b/dotspace/parts/pki.nix new file mode 100644 index 0000000..e8f9969 --- /dev/null +++ b/dotspace/parts/pki.nix @@ -0,0 +1,15 @@ +{ ... }: { + security.pki.certificates = ['' + -----BEGIN CERTIFICATE----- + MIIBqzCCAVGgAwIBAgIQRC/rocbzjexwYz5mWw/YYDAKBggqhkjOPQQDAjA0MRQw + EgYDVQQKDAtEb3RzcGFjZV92MTEcMBoGA1UEAwwTRG90c3BhY2VfdjEgUm9vdCBD + QTAeFw0yNDEwMTgxNjI4NDRaFw0zNDEwMTYxNjI4NDRaMDQxFDASBgNVBAoMC0Rv + dHNwYWNlX3YxMRwwGgYDVQQDDBNEb3RzcGFjZV92MSBSb290IENBMFkwEwYHKoZI + zj0CAQYIKoZIzj0DAQcDQgAEJA1QxB0h6Hvp/0sjxZ+wedEaC0v8ODGb7TOQFNOR + vutG6AeH8F5yRuFmpUjTIXB6nfCn7Ruu1BjL6tjvcAgULqNFMEMwDgYDVR0PAQH/ + BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQEwHQYDVR0OBBYEFPzRcD8OgMChBACO + jN+KyAth49ZjMAoGCCqGSM49BAMCA0gAMEUCIAy+GTFir9N8Xldw0YjQIRZOrM81 + mbpG5txU7FzqEOc0AiEA28/SOnR7hSQEslzfeiDbVk1FCIi9AL64cqv1J+0iJc8= + -----END CERTIFICATE----- + '']; +} diff --git a/remote-system.sh b/remote-system.sh new file mode 100755 index 0000000..3ad7a22 --- /dev/null +++ b/remote-system.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +ssh -tA ${1} " + cd ~/mlaga97-nix \ + && git fetch \ + && git reset --hard origin/main \ + && ./system.sh \ + && git push +" && git fetch diff --git a/systems/bastion/configuration.nix b/systems/bastion/configuration.nix index 180dafb..a40ce34 100644 --- a/systems/bastion/configuration.nix +++ b/systems/bastion/configuration.nix @@ -157,6 +157,9 @@ # Grab a still photo from all cameras once per minute "* * * * * root /home/lauren_lagarde/bin/GetAllCameraImages > /dev/null" + # Pack up yesterday's images into a convenient tarball + "0 3 * * * root /exports/Frigate/LongCam/tar_day.sh $(/run/current-system/sw/bin/date 'yesterday 13:00' +%Y %m %d)" + # TODO: Automatically Collate Camera Images Monthly ]; };