kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-21 04:11:07 +01:00
Code Releases Activity

catullus: fix deploy

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-04-13 23:26:01 +02:00
parent 2426b24b56
commit c0cee07a0d
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
deploy.nix
View File

@@ -10,15 +10,11 @@ let
pkgs = import "${krops}/pkgs" {}; pkgs = import "${krops}/pkgs" {};
importJson = (import <nixpkgs> {}).lib.importJSON; importJson = (import <nixpkgs> {}).lib.importJSON;
source = name: path: lib.evalSource [{ source = {path, other ? {}}: lib.evalSource [({
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs-channels; url = https://github.com/NixOS/nixpkgs-channels;
ref = (importJson ./nixpkgs.json).rev; ref = (importJson ./nixpkgs.json).rev;
}; };
nix-writers.git = {
url = https://cgit.krebsco.de/nix-writers/;
ref = "4d0829328e885a6d7163b513998a975e60dd0a72";
};
# stockholm.git = { # stockholm.git = {
# url = https://cgit.krebsco.de/stockholm; # url = https://cgit.krebsco.de/stockholm;
# ref = "7e1b197dab13d024ba491c96dc959306324943c0"; # ref = "7e1b197dab13d024ba491c96dc959306324943c0";
@@ -33,24 +29,28 @@ let
modules.file = toString ./modules; modules.file = toString ./modules;
nixos-config.symlink = "system/configuration.nix"; nixos-config.symlink = "system/configuration.nix";
# secrets.pass = { } // other)];
# dir = toString ~/.password-store;
# name = name;
# };
}];
systems.scardanelli = pkgs.krops.writeDeploy "deploy-scardanelli" { systems.scardanelli = pkgs.krops.writeDeploy "deploy-scardanelli" {
source = source "scardanelli" ./systems/scardanelli; source = source { path = ./systems/scardanelli; };
target = scardanelli-ssh; target = scardanelli-ssh;
}; };
systems.homeros = pkgs.krops.writeDeploy "deploy-homeros" { systems.homeros = pkgs.krops.writeDeploy "deploy-homeros" {
source = source "homeros" ./systems/homeros; source = source { path = ./systems/homeros; };
target = homeros-ssh; target = homeros-ssh;
}; };
systems.catullus = pkgs.krops.writeDeploy "deploy-catullus" { systems.catullus = pkgs.krops.writeDeploy "deploy-catullus" {
source = source "catullus" ./systems/catullus; source = source {
path = ./systems/catullus;
other = {
secrets.pass = {
dir = toString ~/.password-store;
name = "catullus";
};
};
};
target = catullus-ssh; target = catullus-ssh;
}; };
in systems // { in systems // {

18
systems/catullus/containers.nix
View File

@@ -23,15 +23,15 @@ in {
script = ''${telegram-betacode}/bin/telegram-betacode''; script = ''${telegram-betacode}/bin/telegram-betacode'';
serviceConfig.Restart = "always"; serviceConfig.Restart = "always";
}; };
systemd.services.telegram-horoscope = { # systemd.services.telegram-horoscope = {
wantedBy = [ "multi-user.target" ]; # wantedBy = [ "multi-user.target" ];
description = "Telegram bot for generating horoscope charts"; # description = "Telegram bot for generating horoscope charts";
environment.TELEGRAM_HOROSCOPE_TOKEN = builtins.readFile <secrets/telegram-horoscope.token>; # environment.TELEGRAM_HOROSCOPE_TOKEN = builtins.readFile <secrets/telegram-horoscope.token>;
environment.GOOGLE_MAPS_API_KEY = builtins.readFile <secrets/google-maps.api-key>; # environment.GOOGLE_MAPS_API_KEY = builtins.readFile <secrets/google-maps.api-key>;
enable = true; # enable = true;
script = ''${telegram-horoscope}/bin/telegram-horoscope''; # script = ''${telegram-horoscope}/bin/telegram-horoscope'';
serviceConfig.Restart = "always"; # serviceConfig.Restart = "always";
}; # };
}; };
}; };
} }