diff --git a/configs/workhorse/configuration.nix b/configs/workhorse/configuration.nix index 07d3059..89e6e1f 100644 --- a/configs/workhorse/configuration.nix +++ b/configs/workhorse/configuration.nix @@ -12,7 +12,6 @@ ./jenkins.nix ./kibana.nix ./lektor-gaykraft.nix - ./lektor-techblog.nix ./lektor-terranix.nix ./mail-fetcher.nix ./packages.nix diff --git a/configs/workhorse/jenkins.nix b/configs/workhorse/jenkins.nix index 40540d1..a718394 100644 --- a/configs/workhorse/jenkins.nix +++ b/configs/workhorse/jenkins.nix @@ -91,20 +91,6 @@ in { } ]) - (job "deploy-techblock" { - url = - "ssh://gogs@workhorse.private:2222/palo/tech.ingolf-wagner.de.git"; - credentialsId = gogs-id; - } [ - { "build" = [ "nix-shell --run build" ]; } - { - "publish" = [{ - script = "nix-shell --run publish"; - credentialsId = sshSputnik; - }]; - } - ]) - (job "deploy-terranix" { url = "ssh://gogs@workhorse.private:2222/terranix/terranix.org.git"; credentialsId = gogs-id; @@ -229,6 +215,10 @@ in { "ssh://gogs@workhorse.private:2222/palo/image-generator.git" "git@github.com:mrVanDalo/image-generator.git") + (sync-to-github "sync-tech.ingolf-wagner.de" + "ssh://gogs@workhorse.private:2222/palo/tech.ingolf-wagner.de.git" + "git@github.com:mrVanDalo/tech.ingolf-wagner.de.git") + ]; }; }; diff --git a/configs/workhorse/lektor-techblog.nix b/configs/workhorse/lektor-techblog.nix deleted file mode 100644 index f124efc..0000000 --- a/configs/workhorse/lektor-techblog.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - - containerName = "techblog"; - port = 5002; - repository = - "ssh://gogs@git.ingolf-wagner.de:443/palo/tech.ingolf-wagner.de.git"; - sshKey = toString ; - -in { - - services.nginx = { - enable = true; - statusPage = true; - virtualHosts = { - "${containerName}.${config.networking.hostName}.private" = { - serverAliases = [ ]; - locations."/" = { - proxyPass = - "http://${config.networking.hostName}.private:${toString port}"; - }; - }; - }; - }; - - containers.${containerName} = { - - bindMounts = { - "/var/src" = { - hostPath = toString "/var/src/"; - isReadOnly = true; - }; - }; - - autoStart = true; - config = { config, pkgs, ... }: { - imports = [ ]; - services.lektor = { - enable = true; - host = "git.ingolf-wagner.de"; - sshKey = sshKey; - repository = repository; - port = port; - additionalScript = - pkgs.writeScript "build" "${pkgs.nix}/bin/nix-shell --run build"; - }; - }; - - }; - - # it might take some time will this thing is up - systemd.services."container@${containerName}".serviceConfig.TimeoutStartSec = - lib.mkForce "infinity"; - -}