From 5eb84dd9e72a633b6906fb6aaf1c3527a24b75c5 Mon Sep 17 00:00:00 2001 From: Magic_RB Date: Sun, 23 Apr 2023 22:54:16 +0200 Subject: [PATCH] Remove camptules Signed-off-by: Magic_RB --- containers/camptules.nix | 36 -------------- flake.lock | 21 -------- flake.nix | 5 -- nomad/regions/homelab-1/camptules.tf | 20 -------- nomad/regions/homelab-1/job/camptules.hcl | 58 ----------------------- 5 files changed, 140 deletions(-) delete mode 100644 containers/camptules.nix delete mode 100644 nomad/regions/homelab-1/camptules.tf delete mode 100644 nomad/regions/homelab-1/job/camptules.hcl diff --git a/containers/camptules.nix b/containers/camptules.nix deleted file mode 100644 index cb3a007..0000000 --- a/containers/camptules.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ nglib, camptules, nixpkgs }: -nglib.makeSystem { - system = "x86_64-linux"; - name = "nixng-camptules"; - inherit nixpkgs; - config = ({ pkgs, config, nglib, lib, ... }: - { - imports = [ - camptules.nixngModule - ]; - - config = { - dumb-init = { - enable = true; - type.services = {}; - }; - - services.camptules = { - enable = true; - package = - let - youtube-dl = pkgs.writeShellScriptBin "youtube-dl" - '' - ${pkgs.yt-dlp}/bin/yt-dlp "$@" - ''; - in - pkgs.writeShellScriptBin "camptules" - '' - export PATH=$PATH:${youtube-dl}/bin:${pkgs.ffmpeg}/bin - cd /secrets - ${lib.trace camptules.defaultPackage."x86_64-linux".outPath camptules.defaultPackage."x86_64-linux"}/bin/camptules - ''; - }; - }; - }); -} diff --git a/flake.lock b/flake.lock index 72295d0..026eeb0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,25 +1,5 @@ { "nodes": { - "camptules": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1641345147, - "narHash": "sha256-2DwiEp/pxQ/gIMlJyYOM/q2sEXaJ4LYqhdvW9TrFjpA=", - "ref": "refs/heads/master", - "rev": "67759ba6aede849780dcedcc3b316ccc1c0084b0", - "revCount": 39, - "type": "git", - "url": "https://gitea.redalder.org/ThyW/camptules" - }, - "original": { - "type": "git", - "url": "https://gitea.redalder.org/ThyW/camptules" - } - }, "emacs-htmlize": { "flake": false, "locked": { @@ -152,7 +132,6 @@ }, "root": { "inputs": { - "camptules": "camptules", "nixng": "nixng", "nixpkgs": "nixpkgs", "website": "website" diff --git a/flake.nix b/flake.nix index 5d8b3c2..b560e04 100644 --- a/flake.nix +++ b/flake.nix @@ -10,10 +10,6 @@ url = "git+https://gitea.redalder.org/Magic_RB/website"; inputs.nixpkgs.follows = "nixpkgs"; }; - camptules = { - url = "git+https://gitea.redalder.org/ThyW/camptules"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { self, nixpkgs, nixng, ... }@inputs: @@ -35,7 +31,6 @@ ingressToothpick = import ./containers/ingress-toothpick.nix base; ingressBlowhole = import ./containers/ingress-blowhole.nix base; website = import ./containers/website.nix (base // { inherit (inputs.website) website; }); - camptules = (import ./containers/camptules.nix (base // { inherit (inputs) camptules; })); gitea = import ./containers/gitea.nix base; minecraft = import ./containers/minecraft.nix base; mosquitto = import ./containers/mosquitto.nix base; diff --git a/nomad/regions/homelab-1/camptules.tf b/nomad/regions/homelab-1/camptules.tf deleted file mode 100644 index 0928826..0000000 --- a/nomad/regions/homelab-1/camptules.tf +++ /dev/null @@ -1,20 +0,0 @@ -resource "vault_policy" "camputules-policy" { - name = "camptules-policy" - policy = <