From c305f94612685bc92b3afb8096309704ec4d2526 Mon Sep 17 00:00:00 2001 From: Julius de Jeu Date: Thu, 26 May 2022 00:44:03 +0200 Subject: [PATCH] Update flakes --- nixos/flake.lock | 24 ++++++++++---------- nixos/machines/nginx/default.nix | 3 --- s3-policy.json | 39 -------------------------------- 3 files changed, 12 insertions(+), 54 deletions(-) delete mode 100644 s3-policy.json diff --git a/nixos/flake.lock b/nixos/flake.lock index 4977d69..daa0004 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -10,11 +10,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1652494498, - "narHash": "sha256-KA1PQ8UW9LWKKQjjxGgyLNLkivUg9g4UZtTLIAueoiM=", + "lastModified": 1653210933, + "narHash": "sha256-n6Hk/zPHcjloi0E/miKGnXrWROha90uan2CFQV7oaqI=", "owner": "zhaofengli", "repo": "colmena", - "rev": "ea4f2ba6dcc8ae1796528f94e878722fdf6afcf1", + "rev": "429a0f5aa1d1bac06234e2f0c02d5b63a850d940", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1652457860, - "narHash": "sha256-fZZRON0geucxAFCEamzuZ5z4oj7xJj+6C9HWm1JY2n0=", + "lastModified": 1653339081, + "narHash": "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "11f97f971383d036159edd9221f1b3a60ed78c4f", + "rev": "fb3ee0f618b8c80dea1239691b15dfeb4bb46331", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652881001, - "narHash": "sha256-k9JmPCojaJnqGz4aRXXT1HZqJKHCXijoMfBAb24abXk=", + "lastModified": 1653229824, + "narHash": "sha256-klSCYMpR4TqWYoTD/xZ2qM9UIPRFC6pK+S/kJuVLbFw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d474d6a4a43a0348b78db68dc00c491032cf5cf", + "rev": "06db2e2197401b74fcf82d4e84be15b0b5851c7b", "type": "github" }, "original": { @@ -100,11 +100,11 @@ }, "stable": { "locked": { - "lastModified": 1650830814, - "narHash": "sha256-P7vGsHdS19eHVUJt4BeQA4JfauL2nOpEcnYKIbX76YM=", + "lastModified": 1653087707, + "narHash": "sha256-zfno3snrzZTWQ2B7K53QHrGZwrjnJLTRPalymrSsziU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c254b8c915ac912ae9ee9dc74eac555ccbf33795", + "rev": "cbd40c72b2603ab54e7208f99f9b35fc158bc009", "type": "github" }, "original": { diff --git a/nixos/machines/nginx/default.nix b/nixos/machines/nginx/default.nix index 18a5757..cd66404 100644 --- a/nixos/machines/nginx/default.nix +++ b/nixos/machines/nginx/default.nix @@ -79,9 +79,6 @@ in { http2 = true; globalRedirect = "galerievanslagmaat.nl"; }; - - virtualHosts."test.asraphiel.dev" = proxy "http://hosting-test.lxd:8080/"; - }; security.acme.email = "acme@voidcorp.nl"; diff --git a/s3-policy.json b/s3-policy.json deleted file mode 100644 index bdeef16..0000000 --- a/s3-policy.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "Version": "2012-10-17", - "Statement": [ - { - "Effect": "Allow", - "Principal": { - "AWS": [ - "*" - ] - }, - "Action": [ - "s3:GetBucketLocation", - "s3:ListBucket", - "s3:ListBucketMultipartUploads" - ], - "Resource": [ - "arn:aws:s3:::galerie" - ] - }, - { - "Effect": "Allow", - "Principal": { - "AWS": [ - "*" - ] - }, - "Action": [ - "s3:PutObject", - "s3:AbortMultipartUpload", - "s3:DeleteObject", - "s3:GetObject", - "s3:ListMultipartUploadParts" - ], - "Resource": [ - "arn:aws:s3:::galerie/*" - ] - } - ] -} \ No newline at end of file