docker migration + giving up on collabora
This commit is contained in:
@@ -28,10 +28,10 @@ in {
|
||||
perl
|
||||
(perlPackages.buildPerlPackage rec {
|
||||
pname = "Image-ExifTool";
|
||||
version = "12.60";
|
||||
version = "12.70";
|
||||
src = fetchurl {
|
||||
url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
|
||||
hash = "sha256-c9vgbQBMMQgqVueNfyRvK7AAL7sYNUR7wyorB289Mq0=";
|
||||
hash = "sha256-TLJSJEXMPj870TkExq6uraX8Wl4kmNerrSlX3LQsr/4=";
|
||||
};
|
||||
})
|
||||
]);
|
||||
@@ -45,7 +45,7 @@ in {
|
||||
in {
|
||||
sonarr = base // { package = pkgs.sonarr; };
|
||||
radarr = base // { package = pkgs.radarr; };
|
||||
bazarr = base // { };
|
||||
# bazarr = base // { };
|
||||
jellyfin = base // { };
|
||||
prowlarr.enable = true;
|
||||
microbin = {
|
||||
@@ -196,34 +196,28 @@ in {
|
||||
'';
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [ docker-compose ];
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
enableNvidia = true;
|
||||
storageDriver = "btrfs";
|
||||
};
|
||||
systemd = {
|
||||
services = {
|
||||
docker-compose = {
|
||||
enable = true;
|
||||
restartIfChanged = true;
|
||||
description = "Start docker-compose servers";
|
||||
after = [ "docker.service" "docker.socket" ];
|
||||
requires = [ "docker.service" "docker.socket" ];
|
||||
wantedBy = [ "default.target" ];
|
||||
environment = {
|
||||
FILE = "/home/jawz/Development/Docker/docker-compose.yml";
|
||||
};
|
||||
path = [ pkgs.docker-compose ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
ExecStart =
|
||||
"${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans";
|
||||
ExecStop =
|
||||
"${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down";
|
||||
};
|
||||
};
|
||||
# docker-compose = {
|
||||
# enable = true;
|
||||
# restartIfChanged = true;
|
||||
# description = "Start docker-compose servers";
|
||||
# after = [ "docker.service" "docker.socket" ];
|
||||
# requires = [ "docker.service" "docker.socket" ];
|
||||
# wantedBy = [ "default.target" ];
|
||||
# environment = {
|
||||
# FILE = "/home/jawz/Development/Docker/docker-compose.yml";
|
||||
# };
|
||||
# path = [ pkgs.docker-compose ];
|
||||
# serviceConfig = {
|
||||
# Restart = "on-failure";
|
||||
# RestartSec = 30;
|
||||
# ExecStart =
|
||||
# "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans";
|
||||
# ExecStop =
|
||||
# "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down";
|
||||
# };
|
||||
# };
|
||||
nextcloud-cronjob = let
|
||||
jawzNextcloudCronjob = pkgs.writeScriptBin "nextcloud-cronjob"
|
||||
(builtins.readFile ../scripts/nextcloud-cronjob.sh);
|
||||
|
||||
Reference in New Issue
Block a user