git rid of useless modules
This commit is contained in:
parent
6dc18d06e1
commit
a52507732a
3 changed files with 14 additions and 27 deletions
|
@ -37,12 +37,8 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
sops.secrets.jenkins_token = { };
|
sops.secrets.jenkins_token = {
|
||||||
|
owner = "jenkins";
|
||||||
krops.userKeys."accessToken" = {
|
|
||||||
user = "jenkins";
|
|
||||||
source = config.sops.secrets.jenkins_token.path;
|
|
||||||
requiredBy = [ "jenkins-job-builder.service" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
services.jenkins = {
|
services.jenkins = {
|
||||||
|
@ -57,9 +53,8 @@ in
|
||||||
# - mattermost plugin
|
# - mattermost plugin
|
||||||
jobBuilder = {
|
jobBuilder = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
# create an access token in the admin users panel
|
# create an access token in the admin users panel
|
||||||
accessTokenFile = config.krops.userKeys."accessToken".target;
|
accessTokenFile = config.sops.secrets.jenkins_token.path;
|
||||||
accessUser = "admin";
|
accessUser = "admin";
|
||||||
|
|
||||||
# https://docs.openstack.org/infra/jenkins-job-builder/definition.html#modules
|
# https://docs.openstack.org/infra/jenkins-job-builder/definition.html#modules
|
||||||
|
|
|
@ -20,17 +20,8 @@
|
||||||
url = "github:mrvandalo/home-manager-utils";
|
url = "github:mrvandalo/home-manager-utils";
|
||||||
inputs.home-manager.follows = "home-manager";
|
inputs.home-manager.follows = "home-manager";
|
||||||
};
|
};
|
||||||
backup-module = {
|
|
||||||
url = "git+https://git.ingolf-wagner.de/nix-modules/backup.git";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
krops-lib = {
|
|
||||||
url = "git+https://git.ingolf-wagner.de/nix-modules/krops.git";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
cluster-module = {
|
cluster-module = {
|
||||||
url =
|
url = "git+https://git.ingolf-wagner.de/nix-modules/cluster.git?rev=ef621797a30f8a57de16bf33672abdd411cbcece";
|
||||||
"git+https://git.ingolf-wagner.de/nix-modules/cluster.git?rev=ef621797a30f8a57de16bf33672abdd411cbcece";
|
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
nixpkgs-fmt = {
|
nixpkgs-fmt = {
|
||||||
|
@ -46,9 +37,7 @@
|
||||||
, home-manager
|
, home-manager
|
||||||
, home-manager-utils
|
, home-manager-utils
|
||||||
, doom-emacs-nix
|
, doom-emacs-nix
|
||||||
, backup-module
|
|
||||||
, nixpkgs-unstable
|
, nixpkgs-unstable
|
||||||
, krops-lib
|
|
||||||
, cluster-module
|
, cluster-module
|
||||||
, polygon-art
|
, polygon-art
|
||||||
, nixpkgs-fmt
|
, nixpkgs-fmt
|
||||||
|
@ -59,7 +48,7 @@
|
||||||
nixosSystem = nixpkgs.lib.nixosSystem;
|
nixosSystem = nixpkgs.lib.nixosSystem;
|
||||||
defaultModules = [
|
defaultModules = [
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
{ imports = [ "${krops-lib}" "${cluster-module}" "${backup-module}" ]; }
|
{ imports = [ "${cluster-module}" ]; }
|
||||||
({ pkgs, ... }: {
|
({ pkgs, ... }: {
|
||||||
nix = {
|
nix = {
|
||||||
# no channesl needed this way
|
# no channesl needed this way
|
||||||
|
|
|
@ -4,8 +4,7 @@ let
|
||||||
# command that ensures we use flake.nix during switch
|
# command that ensures we use flake.nix during switch
|
||||||
command = targetPath:
|
command = targetPath:
|
||||||
let
|
let
|
||||||
commandLine =
|
commandLine = "TMPDIR=/tmp nixos-rebuild test --flake ${targetPath} -L --keep-going";
|
||||||
"TMPDIR=/tmp nixos-rebuild test --flake ${targetPath} -L --keep-going";
|
|
||||||
in
|
in
|
||||||
''
|
''
|
||||||
echo '${commandLine}'
|
echo '${commandLine}'
|
||||||
|
@ -105,16 +104,20 @@ in
|
||||||
(desktop {
|
(desktop {
|
||||||
name = "sterni";
|
name = "sterni";
|
||||||
host = "sterni.private";
|
host = "sterni.private";
|
||||||
}) // (desktop {
|
}) //
|
||||||
|
(desktop {
|
||||||
name = "sternchen";
|
name = "sternchen";
|
||||||
host = "sternchen.secret";
|
host = "sternchen.secret";
|
||||||
}) // (server {
|
}) //
|
||||||
|
(server {
|
||||||
name = "pepe";
|
name = "pepe";
|
||||||
host = "pepe.private";
|
host = "pepe.private";
|
||||||
}) // (server {
|
}) //
|
||||||
|
(server {
|
||||||
name = "workhorse";
|
name = "workhorse";
|
||||||
host = "workhorse.private";
|
host = "workhorse.private";
|
||||||
}) // (server {
|
}) //
|
||||||
|
(server {
|
||||||
name = "sputnik";
|
name = "sputnik";
|
||||||
host = "sputnik.private";
|
host = "sputnik.private";
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue