diff options
Diffstat (limited to 'lass/2configs')
| -rw-r--r-- | lass/2configs/base.nix | 3 | ||||
| -rw-r--r-- | lass/2configs/bitlbee.nix | 3 | ||||
| -rw-r--r-- | lass/2configs/ircd.nix | 18 | ||||
| -rw-r--r-- | lass/2configs/os-templates/CAC-CentOS-7-64bit.nix | 47 |
4 files changed, 62 insertions, 9 deletions
diff --git a/lass/2configs/base.nix b/lass/2configs/base.nix index 43c4f4e34..f313054d9 100644 --- a/lass/2configs/base.nix +++ b/lass/2configs/base.nix @@ -6,6 +6,7 @@ with lib; ../2configs/vim.nix ../2configs/zsh.nix ../2configs/mc.nix + ../2configs/retiolum.nix { users.extraUsers = mapAttrs (_: h: { hashedPassword = h; }) @@ -44,7 +45,7 @@ with lib; build.source = { git.nixpkgs = { url = https://github.com/Lassulus/nixpkgs; - rev = "e916273209560b302ab231606babf5ce1c481f08"; + rev = "b9270a2e8ac3d2cf4c95075a9529528aa1d859da"; }; }; }; diff --git a/lass/2configs/bitlbee.nix b/lass/2configs/bitlbee.nix index 3a0080402..fa14c7fea 100644 --- a/lass/2configs/bitlbee.nix +++ b/lass/2configs/bitlbee.nix @@ -8,8 +8,9 @@ in { ../3modules/bitlbee.nix ]; - config.lass.bitlbee = { + lass.bitlbee = { enable = true; bitlbeePkg = lpkgs.bitlbee; + portNumber = 6666; }; } diff --git a/lass/2configs/ircd.nix b/lass/2configs/ircd.nix index e48bbfd3e..4d2c134b6 100644 --- a/lass/2configs/ircd.nix +++ b/lass/2configs/ircd.nix @@ -46,24 +46,28 @@ class "users" { ping_time = 2 minutes; - number_per_ident = 200; - number_per_ip = 200; - number_per_ip_global = 500; + number_per_ident = 10; + number_per_ip = 2048; + number_per_ip_global = 4096; cidr_ipv4_bitlen = 24; cidr_ipv6_bitlen = 64; - number_per_cidr = 9000; - max_number = 10000; - sendq = 400 kbytes; + number_per_cidr = 65536; + max_number = 3000; + sendq = 1 megabyte; }; exempt { ip = "127.0.0.1"; }; + exempt { + ip = "10.243.0.0/16"; + }; + auth { user = "*@*"; class = "users"; - flags = exceed_limit; + flags = kline_exempt, exceed_limit, flood_exempt; }; channel { diff --git a/lass/2configs/os-templates/CAC-CentOS-7-64bit.nix b/lass/2configs/os-templates/CAC-CentOS-7-64bit.nix new file mode 100644 index 000000000..168d1d97b --- /dev/null +++ b/lass/2configs/os-templates/CAC-CentOS-7-64bit.nix @@ -0,0 +1,47 @@ +_: + +{ + boot.loader.grub = { + device = "/dev/sda"; + splashImage = null; + }; + + boot.initrd.availableKernelModules = [ + "ata_piix" + "vmw_pvscsi" + ]; + + fileSystems."/" = { + device = "/dev/centos/root"; + fsType = "xfs"; + }; + + fileSystems."/boot" = { + device = "/dev/sda1"; + fsType = "xfs"; + }; + + swapDevices = [ + { device = "/dev/centos/swap"; } + ]; + + users.extraGroups = { + # ● systemd-tmpfiles-setup.service - Create Volatile Files and Directories + # Loaded: loaded (/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/example/systemd/system/systemd-tmpfiles-setup.service) + # Active: failed (Result: exit-code) since Mon 2015-03-16 10:29:18 UTC; 4s ago + # Docs: man:tmpfiles.d(5) + # man:systemd-tmpfiles(8) + # Process: 19272 ExecStart=/nix/store/2l33gg7nmncqkpysq9f5fxyhlw6ncm2j-systemd-217/bin/systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev (code=exited, status=1/FAILURE) + # Main PID: 19272 (code=exited, status=1/FAILURE) + # + # Mar 16 10:29:17 cd systemd-tmpfiles[19272]: [/usr/lib/tmpfiles.d/legacy.conf:26] Unknown group 'lock'. + # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal configured, ignoring. + # Mar 16 10:29:18 cd systemd-tmpfiles[19272]: Two or more conflicting lines for /var/log/journal/7b35116927d74ea58785e00b47ac0f0d configured, ignoring. + # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service: main process exited, code=exited, status=1/FAILURE + # Mar 16 10:29:18 cd systemd[1]: Failed to start Create Volatile Files and Directories. + # Mar 16 10:29:18 cd systemd[1]: Unit systemd-tmpfiles-setup.service entered failed state. + # Mar 16 10:29:18 cd systemd[1]: systemd-tmpfiles-setup.service failed. + # warning: error(s) occured while switching to the new configuration + lock.gid = 10001; + }; +} |