Merge branch 'master' into 20.09
This commit is contained in:
commit
090ce70e7d
@ -1,19 +1,13 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }: let
|
||||||
|
|
||||||
{
|
unstable = import <nixpkgs-unstable> { config.allowUnfree = true; };
|
||||||
users.users = {
|
|
||||||
mc = {
|
in {
|
||||||
name = "mc";
|
services.minecraft-server = {
|
||||||
description = "user playing mc";
|
enable = true;
|
||||||
home = "/home/mc";
|
eula = true;
|
||||||
createHome = true;
|
package = unstable.minecraft-server;
|
||||||
useDefaultShell = true;
|
|
||||||
packages = with pkgs; [
|
|
||||||
tmux
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
krebs.per-user.mc.packages = [ pkgs.jdk ];
|
|
||||||
krebs.iptables.tables.filter.INPUT.rules = [
|
krebs.iptables.tables.filter.INPUT.rules = [
|
||||||
{ predicate = "-p tcp --dport 25565"; target = "ACCEPT"; }
|
{ predicate = "-p tcp --dport 25565"; target = "ACCEPT"; }
|
||||||
{ predicate = "-p udp --dport 25565"; target = "ACCEPT"; }
|
{ predicate = "-p udp --dport 25565"; target = "ACCEPT"; }
|
||||||
|
@ -91,7 +91,7 @@ in {
|
|||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
hostName = "o.xanf.org";
|
hostName = "o.xanf.org";
|
||||||
package = pkgs.nextcloud18;
|
package = pkgs.nextcloud19;
|
||||||
config = {
|
config = {
|
||||||
adminpassFile = toString <secrets> + "/nextcloud_pw";
|
adminpassFile = toString <secrets> + "/nextcloud_pw";
|
||||||
overwriteProtocol = "https";
|
overwriteProtocol = "https";
|
||||||
@ -174,6 +174,7 @@ in {
|
|||||||
|
|
||||||
users.users.xanf = {
|
users.users.xanf = {
|
||||||
uid = genid_uint31 "xanf";
|
uid = genid_uint31 "xanf";
|
||||||
|
group = "xanf";
|
||||||
home = "/home/xanf";
|
home = "/home/xanf";
|
||||||
useDefaultShell = true;
|
useDefaultShell = true;
|
||||||
createHome = true;
|
createHome = true;
|
||||||
@ -251,6 +252,16 @@ in {
|
|||||||
createHome = true;
|
createHome = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
users.users.XANF_TEAM = {
|
||||||
|
uid = genid_uint31 "XANF_TEAM";
|
||||||
|
group = "xanf";
|
||||||
|
home = "/home/XANF_TEAM";
|
||||||
|
useDefaultShell = true;
|
||||||
|
createHome = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
users.groups.xanf = {};
|
||||||
|
|
||||||
krebs.on-failure.plans.restic-backups-domsen = {
|
krebs.on-failure.plans.restic-backups-domsen = {
|
||||||
journalctl = {
|
journalctl = {
|
||||||
lines = 1000;
|
lines = 1000;
|
||||||
|
Loading…
Reference in New Issue
Block a user