minor improvements
This commit is contained in:
parent
2e4fc1a8cc
commit
fc63aaf719
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
clerie.monitoring = {
|
clerie.monitoring = {
|
||||||
enable = true;
|
enable = true;
|
||||||
id = "201";
|
id = "35";
|
||||||
privKeyFile = "/run/keys/wg-dyon_priv";
|
privKeyFile = "/run/keys/wg-dyon_priv";
|
||||||
pubkey = "4faakn5yfzukxRwo79iTawag4jzAFkErXHLeEvtoLCc=";
|
pubkey = "4faakn5yfzukxRwo79iTawag4jzAFkErXHLeEvtoLCc=";
|
||||||
};
|
};
|
||||||
|
|
|
@ -55,7 +55,7 @@ in {
|
||||||
static_configs = [
|
static_configs = [
|
||||||
{
|
{
|
||||||
targets = [
|
targets = [
|
||||||
"monitoring-1.mon.entr0py.de:9090"
|
"[::1]:9090"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
@ -42,11 +42,11 @@
|
||||||
environment = {
|
environment = {
|
||||||
/*DRONE_DATABASE_DRIVER="postgres";
|
/*DRONE_DATABASE_DRIVER="postgres";
|
||||||
DRONE_DATABASE_DATASOURCE="postgresql:///drone?host=/run/postgresql";*/
|
DRONE_DATABASE_DATASOURCE="postgresql:///drone?host=/run/postgresql";*/
|
||||||
DRONE_DATABASE_SECRET= toString ./drone_database.secret;
|
DRONE_DATABASE_SECRET= (builtins.readFile ./drone_database.secret);
|
||||||
DRONE_GITEA_SERVER="https://git.entr0py.de";
|
DRONE_GITEA_SERVER="https://git.entr0py.de";
|
||||||
DRONE_GITEA_CLIENT_ID="07f3c25c-4f9d-4642-afcf-c419976cfaac";
|
DRONE_GITEA_CLIENT_ID="07f3c25c-4f9d-4642-afcf-c419976cfaac";
|
||||||
DRONE_GITEA_CLIENT_SECRET= toString ./gitea_client.secret;
|
DRONE_GITEA_CLIENT_SECRET= (builtins.readFile ./gitea_client.secret);
|
||||||
DRONE_RPC_SECRET= toString ./drone_rpc.secret;
|
DRONE_RPC_SECRET= (builtins.readFile ./drone_rpc.secret);
|
||||||
DRONE_SERVER_HOST="drone.entr0py.de";
|
DRONE_SERVER_HOST="drone.entr0py.de";
|
||||||
DRONE_SERVER_PROTO="https";
|
DRONE_SERVER_PROTO="https";
|
||||||
DRONE_USER_CREATE="username:garionion,admin:true";
|
DRONE_USER_CREATE="username:garionion,admin:true";
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
dependsOn = [ "drone-server" ];
|
dependsOn = [ "drone-server" ];
|
||||||
image = "drone/drone-runner-docker:1";
|
image = "drone/drone-runner-docker:1";
|
||||||
environment = {
|
environment = {
|
||||||
DRONE_RPC_SECRET= toString ./drone_rpc.secret;
|
DRONE_RPC_SECRET= (builtins.readFile ./drone_rpc.secret);
|
||||||
DRONE_RPC_PROTO="https";
|
DRONE_RPC_PROTO="https";
|
||||||
DRONE_RPC_HOST="drone.entr0py.de";
|
DRONE_RPC_HOST="drone.entr0py.de";
|
||||||
DRONE_RUNNER_CAPACITY="4";
|
DRONE_RUNNER_CAPACITY="4";
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
peers = [{
|
peers = [{
|
||||||
publicKey = "bgWFMIasw+IHfr/1drJWEHBcsCZ3fqoB4djiZ9BDUCM=";
|
publicKey = "bgWFMIasw+IHfr/1drJWEHBcsCZ3fqoB4djiZ9BDUCM=";
|
||||||
allowedIPs = [ "2a03:4000:20:18e::/64" "fd33:ab07:f877:23:300::1/72" ];
|
allowedIPs = [ "2a03:4000:20:18e::/64" "fd33:ab07:f877:23:300::1/72" ];
|
||||||
endpoint = "usg.net.entr0py.de:52820";
|
|
||||||
persistentKeepalive = 25;
|
persistentKeepalive = 25;
|
||||||
}];
|
}];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue