remove e11sync

This commit is contained in:
Motiejus Jakštys 2024-07-16 06:14:22 +03:00
parent f47b8d09f8
commit 40bf9c4ab5
5 changed files with 0 additions and 91 deletions

View File

@ -51,39 +51,6 @@
"type": "github" "type": "github"
} }
}, },
"e11sync": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"flake-utils": [
"flake-utils"
],
"geoip2-tarball": "geoip2-tarball",
"gitignore": [
"gitignore"
],
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks": [
"pre-commit-hooks"
]
},
"locked": {
"lastModified": 1717586525,
"narHash": "sha256-wnUwdn3sI2SFauM21CZGj9GCJxSTa6huBU6D4cwlNtU=",
"ref": "refs/heads/main",
"rev": "ece51ae1d4c39d98e6a54e03b71413779996b3ff",
"revCount": 188,
"type": "git",
"url": "https://git.jakstys.lt/motiejus/e11sync"
},
"original": {
"type": "git",
"url": "https://git.jakstys.lt/motiejus/e11sync"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1717312683, "lastModified": 1717312683,
@ -117,19 +84,6 @@
"type": "github" "type": "github"
} }
}, },
"geoip2-tarball": {
"flake": false,
"locked": {
"lastModified": 1705308463,
"narHash": "sha256-Q+t6LnGy8R6QLugw25iC0WdVPU2C3eqZPlbvVQ9EpwE=",
"type": "tarball",
"url": "https://dl.jakstys.lt/_/2024.01.13.tar.zst"
},
"original": {
"type": "tarball",
"url": "https://dl.jakstys.lt/_/2024.01.13.tar.zst"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -310,7 +264,6 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"e11sync": "e11sync",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"gitignore": "gitignore", "gitignore": "gitignore",

View File

@ -53,17 +53,6 @@
gitignore.follows = "gitignore"; gitignore.follows = "gitignore";
}; };
}; };
e11sync = {
url = "git+https://git.jakstys.lt/motiejus/e11sync";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
gitignore.follows = "gitignore";
pre-commit-hooks.follows = "pre-commit-hooks";
};
};
}; };
nixConfig = { nixConfig = {
@ -85,7 +74,6 @@
pre-commit-hooks, pre-commit-hooks,
nur, nur,
nixgl, nixgl,
e11sync,
... ...
} @ inputs: let } @ inputs: let
myData = import ./data.nix; myData = import ./data.nix;
@ -93,7 +81,6 @@
overlays = [ overlays = [
nur.overlay nur.overlay
nixgl.overlay nixgl.overlay
e11sync.overlays.default
(_self: super: {deploy-rs-pkg = super.deploy-rs;}) (_self: super: {deploy-rs-pkg = super.deploy-rs;})
deploy-rs.overlay deploy-rs.overlay
@ -252,7 +239,6 @@
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
{nixpkgs.overlays = overlays;} {nixpkgs.overlays = overlays;}
e11sync.nixosModules.e11sync
agenix.nixosModules.default agenix.nixosModules.default
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
@ -263,7 +249,6 @@
age.secrets = { age.secrets = {
zfs-passphrase-vno1-oh2.file = ./secrets/vno1-oh2/zfs-passphrase.age; zfs-passphrase-vno1-oh2.file = ./secrets/vno1-oh2/zfs-passphrase.age;
borgbackup-password.file = ./secrets/fra1-a/borgbackup-password.age; borgbackup-password.file = ./secrets/fra1-a/borgbackup-password.age;
e11sync-secret-key.file = ./secrets/e11sync/secret-key.age;
motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age; motiejus-passwd-hash.file = ./secrets/motiejus_passwd_hash.age;
root-passwd-hash.file = ./secrets/root_passwd_hash.age; root-passwd-hash.file = ./secrets/root_passwd_hash.age;
sasl-passwd.file = ./secrets/postfix_sasl_passwd.age; sasl-passwd.file = ./secrets/postfix_sasl_passwd.age;

View File

@ -1,7 +1,6 @@
{ {
lib, lib,
config, config,
pkgs,
myData, myData,
modulesPath, modulesPath,
... ...
@ -49,20 +48,6 @@
enable = true; enable = true;
mountpoints = ["/var/lib"]; mountpoints = ["/var/lib"];
}; };
zfsborg = {
enable = true;
passwordPath = config.age.secrets.borgbackup-password.path;
sshKeyPath = "/etc/ssh/ssh_host_ed25519_key";
dirs = [
{
mountpoint = "/var/lib";
repo = "zh2769@zh2769.rsync.net:${config.networking.hostName}.${config.networking.domain}-var_lib";
paths = ["private/e11sync-backend"];
backup_at = "*-*-* 01:00:00 UTC";
}
];
};
}; };
services = { services = {
@ -111,13 +96,6 @@
}; };
}; };
e11sync = {
enable = true;
migrateOnStart = true;
secretKeyPath = config.age.secrets.e11sync-secret-key.path;
vhost = "11sync.net";
};
services = { services = {
caddy = { caddy = {
enable = true; enable = true;
@ -134,12 +112,6 @@
"11sync.net".extraConfig = lib.mkForce '' "11sync.net".extraConfig = lib.mkForce ''
redir https://jakstys.lt/2024/11sync-shutdown/ redir https://jakstys.lt/2024/11sync-shutdown/
''; '';
"http://admin.11sync.net".extraConfig = ''
@denied not remote_ip ${myData.subnets.tailscale.cidr}
redir / /admin/
${builtins.readFile "${pkgs.e11sync-caddyfile}"}
'';
}; };
}; };

View File

@ -42,7 +42,6 @@ in
// mk ([fra1-a] ++ motiejus) [ // mk ([fra1-a] ++ motiejus) [
"secrets/vno1-oh2/zfs-passphrase.age" "secrets/vno1-oh2/zfs-passphrase.age"
"secrets/fra1-a/borgbackup-password.age" "secrets/fra1-a/borgbackup-password.age"
"secrets/e11sync/secret-key.age"
] ]
// mk ([vno3-rp3b] ++ motiejus) [ // mk ([vno3-rp3b] ++ motiejus) [
"secrets/vno3-rp3b/datapool-passphrase.age" "secrets/vno3-rp3b/datapool-passphrase.age"

Binary file not shown.