This commit is contained in:
parent
85e5c9d00e
commit
dd76435ec3
@ -20,7 +20,6 @@
|
||||
## Custom Services
|
||||
custom = {
|
||||
locations.autoServe = true;
|
||||
drone.server.path = "/data/drone";
|
||||
};
|
||||
|
||||
## Networking
|
||||
|
@ -6,7 +6,6 @@
|
||||
./chia.nix
|
||||
./common/hostinfo.nix
|
||||
./desktop/awesome/default.nix
|
||||
./drone/default.nix
|
||||
./ids.nix
|
||||
./impermanence.nix
|
||||
./locations.nix
|
||||
|
@ -1,7 +0,0 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./server.nix
|
||||
];
|
||||
}
|
@ -1,43 +0,0 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
cfg = config.custom.drone.server;
|
||||
in
|
||||
{
|
||||
options.custom.drone.server = {
|
||||
enable = lib.mkEnableOption "drone server";
|
||||
|
||||
path = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/var/lib/drone";
|
||||
};
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 18733;
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
age.secrets."drone/gitea_client_secret".file = ../../secrets/drone/gitea_client_secret.age;
|
||||
age.secrets."drone/rpc_secret".file = ../../secrets/drone/rpc_secret.age;
|
||||
|
||||
virtualisation.oci-containers.containers."drone" = {
|
||||
image = "drone/drone:2.21.0";
|
||||
volumes = [ "${cfg.path}:/data" ];
|
||||
ports = [ "${toString cfg.port}:80" ];
|
||||
environment = {
|
||||
DRONE_AGENTS_ENABLED = "true";
|
||||
DRONE_GITEA_SERVER = "https://gitea.hillion.co.uk";
|
||||
DRONE_GITEA_CLIENT_ID = "687ee331-ad9e-44fd-9e02-7f1c652754bb";
|
||||
DRONE_SERVER_HOST = "drone.hillion.co.uk";
|
||||
DRONE_SERVER_PROTO = "https";
|
||||
DRONE_LOGS_DEBUG = "true";
|
||||
DRONE_USER_CREATE = "username:JakeHillion,admin:true";
|
||||
};
|
||||
environmentFiles = [
|
||||
config.age.secrets."drone/gitea_client_secret".path
|
||||
config.age.secrets."drone/rpc_secret".path
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
@ -20,9 +20,6 @@ in
|
||||
matrix = "jorah.cx.ts.hillion.co.uk";
|
||||
unifi = "jorah.cx.ts.hillion.co.uk";
|
||||
};
|
||||
drone = {
|
||||
server = "vm.strangervm.ts.hillion.co.uk";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -34,7 +31,5 @@ in
|
||||
custom.services.mastodon.enable = cfg.locations.services.mastodon == config.networking.fqdn;
|
||||
custom.services.matrix.enable = cfg.locations.services.matrix == config.networking.fqdn;
|
||||
custom.services.unifi.enable = cfg.locations.services.unifi == config.networking.fqdn;
|
||||
|
||||
custom.drone.server.enable = cfg.locations.drone.server == config.networking.fqdn;
|
||||
};
|
||||
}
|
||||
|
@ -47,9 +47,6 @@ in
|
||||
reverse_proxy /_matrix/* http://${locations.services.matrix}:8008
|
||||
reverse_proxy /_synapse/client/* http://${locations.services.matrix}:8008
|
||||
'';
|
||||
"drone.hillion.co.uk".extraConfig = ''
|
||||
reverse_proxy http://${locations.drone.server}:18733
|
||||
'';
|
||||
"links.hillion.co.uk".extraConfig = ''
|
||||
redir https://matrix.to/#/@jake:hillion.co.uk
|
||||
'';
|
||||
|
Binary file not shown.
@ -1,22 +0,0 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-rsa GxPFJQ
|
||||
B1tLU+ypxVOlO9jSZUvUwb69QrNk/rqJoYjdNSOJxSWk7+iX0jli0TrU8AePnfSn
|
||||
NjemcJJCoaSf5q7RQJK9Gfvq6BE1z4EoablA3Sx9un/qqUJuIy3SiQhR5+y5bPD0
|
||||
+8FzLznorSQR5tc1mQo82S1lv0ec8hqw2q13Kqm/09NIiZNKSLoHkp031q3VZbjC
|
||||
XL2naNUqX4lNADqDxESbY5au3CsnBJGN2gX0syj0d1iRx0At2HJSR7gANCEYpWKI
|
||||
nBF+5mlX7lbpb61CoDUiQSW4JiXCULz1kiR7WWJQBrlFryn4CJ2PAUJTKUfzKO8t
|
||||
sgi02DX7frP4jMOt/Z5VMA
|
||||
-> ssh-rsa K9mW1w
|
||||
sPxe/ErVYvJmogtrhHikq7lz2c5jSYxb/mhDHdSAIQIV3b7zWOreEbLOxDnzr/K7
|
||||
pSHTLTIWXxiCEWxunrhUccGHiBEoP40MkcYJnxyuG49Fu42I9K8Gsq4GI05zF9Kl
|
||||
HKwVOwD7gF3QMgkDCxFuqCsmQLB11Evwc7NnbR0+Z3Y9o4FfP4SCXc87Ye+C9zn8
|
||||
9dRxjpRo1Qz9WtW2VG+qdaWldwo0BLtQILDQoR08GW8D1CZvsqXuHsoGLCMoPcgk
|
||||
H2TEwawh1V/bY/j0Y509sVQWn3FF27taqeEQYZOQOwUWNf10cAsDTDUjdYyc9fjJ
|
||||
Hx62FPHP9wmGsViNhn4gbg
|
||||
-> ssh-ed25519 O0LMHg 9CZI1FtkDLXaIdP9Qlx8O0hUfbdzfrJdK67ifPVDjQM
|
||||
Zqd5xtiaDBi7IFnab2bZQVzzEX0YQDrPYfvur9N6JT8
|
||||
-> I-grease V-d-})j
|
||||
mxJ1WhR/NqdMpIbCaM2jxxmffNAy/t9vByK+c9FNIzb3t87VUcALJxuSmswdNVqs
|
||||
1iL6
|
||||
--- ZJ3HoKn0QVAGVsB57bTaCEU19BuLas9SLRjczmomG1g
|
||||
ë>Ÿ‚xæÀ(¤G–$_¤ßWbw
›-]³UŸ<55>q~ˆS·ˆö`“ê¹ÄŽÌ-pQ,ID‰À@ÛïÞvf£FäøHÙ0Ù-ù:ð·ÄOñèÆA
|
@ -76,10 +76,6 @@ in
|
||||
# Spotify Secrets
|
||||
"spotify/11132032266.age".publicKeys = jake_users ++ [ ts.terminals.jakehillion.gendry ];
|
||||
|
||||
# Drone Secrets
|
||||
"drone/gitea_client_secret.age".publicKeys = jake_users ++ [ ts.strangervm.vm ];
|
||||
"drone/rpc_secret.age".publicKeys = jake_users ++ [ ts.strangervm.vm ];
|
||||
|
||||
# Mastodon Secrets
|
||||
"mastodon/social.hillion.co.uk/otp_secret_file.age".publicKeys = jake_users ++ [ ts.strangervm.vm ];
|
||||
"mastodon/social.hillion.co.uk/secret_key_base.age".publicKeys = jake_users ++ [ ts.strangervm.vm ];
|
||||
|
Loading…
Reference in New Issue
Block a user