Bumped to 20.03
This commit is contained in:
parent
b56eabf1ba
commit
d6146b8ab8
|
@ -1,10 +0,0 @@
|
||||||
# SD image for paidh-tri
|
|
||||||
|
|
||||||
{ ... }: {
|
|
||||||
|
|
||||||
imports = [
|
|
||||||
./sd-image_paidh-base.nix
|
|
||||||
../hosts/paidh-tri.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
}
|
|
|
@ -43,6 +43,15 @@
|
||||||
''
|
''
|
||||||
gitea-users gitea gitea
|
gitea-users gitea gitea
|
||||||
'';
|
'';
|
||||||
|
ensureDatabases = [ "gitea" ]; # Ensure the database persists
|
||||||
|
ensureUsers = [
|
||||||
|
{
|
||||||
|
name = "gitea"; # Ensure the database user persists
|
||||||
|
ensurePermissions = { # Ensure the database permissions persist
|
||||||
|
"DATABASE gitea" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
disabledModules = [ "services/continuous-integration/hydra/default.nix" ];
|
#disabledModules = [ "services/continuous-integration/hydra/default.nix" ];
|
||||||
|
|
||||||
imports = [
|
#imports = [
|
||||||
/home/craige/source/NixOS/hydra/hydra-module.nix
|
# /home/craige/source/NixOS/hydra/hydra-module.nix
|
||||||
];
|
# ];
|
||||||
|
|
||||||
services.postfix = {
|
services.postfix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -25,13 +25,25 @@
|
||||||
hydra-users root postgres
|
hydra-users root postgres
|
||||||
hydra-users postgres postgres
|
hydra-users postgres postgres
|
||||||
'';
|
'';
|
||||||
|
ensureDatabases = [ "hydra" ]; # Ensure the database persists
|
||||||
|
ensureUsers = [
|
||||||
|
{
|
||||||
|
name = "hydra"; # Ensure the database user persists
|
||||||
|
ensurePermissions = { # Ensure the database permissions persist
|
||||||
|
"DATABASE hydra" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ config.services.hydra-dev.port ];
|
#networking.firewall.allowedTCPPorts = [ config.services.hydra-dev.port ];
|
||||||
|
networking.firewall.allowedTCPPorts = [ config.services.hydra.port ];
|
||||||
|
|
||||||
services.hydra-dev = {
|
#services.hydra-dev = {
|
||||||
|
services.hydra = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.callPackage ./hydra-dev.nix {}; # Remove to use stable Hydra
|
#package = pkgs.callPackage ./hydra-dev.nix {}; # Remove to use stable Hydra
|
||||||
|
package = pkgs.hydra-unstable;
|
||||||
useSubstitutes = true;
|
useSubstitutes = true;
|
||||||
hydraURL = "https://hydra.mcwhirter.io";
|
hydraURL = "https://hydra.mcwhirter.io";
|
||||||
notificationSender = "hydra.mcwhirter.io";
|
notificationSender = "hydra.mcwhirter.io";
|
||||||
|
|
|
@ -100,6 +100,18 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.postgresql = {
|
||||||
|
ensureDatabases = [ "matrix-synapse" ]; # Ensure the database persists
|
||||||
|
ensureUsers = [
|
||||||
|
{
|
||||||
|
name = "matrix-synapse"; # Ensure the database user persists
|
||||||
|
ensurePermissions = { # Ensure the database permissions persist
|
||||||
|
"DATABASE \"matrix-synapse\"" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
security.acme = {
|
security.acme = {
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
certs = {
|
certs = {
|
||||||
|
|
|
@ -27,10 +27,13 @@
|
||||||
|
|
||||||
services.postgresql = {
|
services.postgresql = {
|
||||||
enable = true; # Ensure postgresql is enabled
|
enable = true; # Ensure postgresql is enabled
|
||||||
ensureDatabases = [ "nextcloud" ]; # Ensure the database exists
|
ensureDatabases = [ "nextcloud" ]; # Ensure the database persists
|
||||||
ensureUsers = [
|
ensureUsers = [
|
||||||
{ name = "nextcloud"; # Ensure the database user exists
|
{
|
||||||
ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES";
|
name = "nextcloud"; # Ensure the database user persists
|
||||||
|
ensurePermissions = { # Ensure the database permissions persist
|
||||||
|
"DATABASE nextcloud" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -27,6 +27,15 @@
|
||||||
''
|
''
|
||||||
tt_rss-users tt_rss tt_rss
|
tt_rss-users tt_rss tt_rss
|
||||||
'';
|
'';
|
||||||
|
ensureDatabases = [ "tt_rss" ]; # Ensure the database persists
|
||||||
|
ensureUsers = [
|
||||||
|
{
|
||||||
|
name = "tt_rss"; # Ensure the database user persists
|
||||||
|
ensurePermissions = { # Ensure the database permissions persist
|
||||||
|
"DATABASE tt_rss" = "ALL PRIVILEGES";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
|
|
Loading…
Reference in a new issue