Compare commits

...

12 Commits
master ... mail

7 changed files with 49 additions and 17 deletions
Split View
  1. +7
    -3
      hosts/daedalus/hardware-configuration.nix
  2. +7
    -4
      hosts/icarus/hardware-configuration.nix
  3. +5
    -0
      hosts/m1vm/hardware-configuration.nix
  4. +5
    -5
      services/dovecot/default.nix
  5. +21
    -1
      services/gluster.nix
  6. +3
    -4
      services/postfix/default.nix
  7. +1
    -0
      services/ssh.nix

+ 7
- 3
hosts/daedalus/hardware-configuration.nix View File

@@ -27,9 +27,13 @@ in {
fileSystems."/gstorage/brick2/gvhomes" = common.zfsMountConfig "zbrick2/gvhomes";
fileSystems."/gstorage/brick3/gvhomes" = common.zfsMountConfig "zbrick3/gvhomes";

fileSystems."/gstorage/brick1/gvwebtree" = common.zfsMountConfig "zbrick1/gvwebtree";
fileSystems."/gstorage/brick2/gvwebtree" = common.zfsMountConfig "zbrick2/gvwebtree";
fileSystems."/gstorage/brick3/gvwebtree" = common.zfsMountConfig "zbrick3/gvwebtree";
fileSystems."/gstorage/brick1/gvservices" = common.zfsMountConfig "zbrick1/gvservices";
fileSystems."/gstorage/brick2/gvservices" = common.zfsMountConfig "zbrick2/gvservices";
fileSystems."/gstorage/brick3/gvservices" = common.zfsMountConfig "zbrick3/gvservices";

fileSystems."/gstorage/brick1/gvarchive" = common.zfsMountConfig "zbrick1/gvarchive";
fileSystems."/gstorage/brick2/gvarchive" = common.zfsMountConfig "zbrick2/gvarchive";
fileSystems."/gstorage/brick3/gvarchive" = common.zfsMountConfig "zbrick3/gvarchive";

swapDevices =
[ { device = "/dev/disk/by-uuid/66307090-88b1-4467-acfe-a22c2a06e2ce"; }


+ 7
- 4
hosts/icarus/hardware-configuration.nix View File

@@ -27,10 +27,13 @@ in {
fileSystems."/gstorage/brick2/gvhomes" = common.zfsMountConfig "zbrick2/gvhomes";
fileSystems."/gstorage/brick3/gvhomes" = common.zfsMountConfig "zbrick3/gvhomes";

# TODO rename to gvservices, add gvarchive
fileSystems."/gstorage/brick1/gvwebtree" = common.zfsMountConfig "zbrick1/gvwebtree";
fileSystems."/gstorage/brick2/gvwebtree" = common.zfsMountConfig "zbrick2/gvwebtree";
fileSystems."/gstorage/brick3/gvwebtree" = common.zfsMountConfig "zbrick3/gvwebtree";
fileSystems."/gstorage/brick1/gvservices" = common.zfsMountConfig "zbrick1/gvservices";
fileSystems."/gstorage/brick2/gvservices" = common.zfsMountConfig "zbrick2/gvservices";
fileSystems."/gstorage/brick3/gvservices" = common.zfsMountConfig "zbrick3/gvservices";

fileSystems."/gstorage/brick1/gvarchive" = common.zfsMountConfig "zbrick1/gvarchive";
fileSystems."/gstorage/brick2/gvarchive" = common.zfsMountConfig "zbrick2/gvarchive";
fileSystems."/gstorage/brick3/gvarchive" = common.zfsMountConfig "zbrick3/gvarchive";

swapDevices =
[ { device = "/dev/disk/by-uuid/e915505b-9777-4362-ab8e-0b6d069e3916"; }


+ 5
- 0
hosts/m1vm/hardware-configuration.nix View File

@@ -17,6 +17,11 @@
fsType = "ext4";
};

fileSystems."/home" = {
device = "azazel.internal:/storage/home";
fsType = "nfs";
};

swapDevices =
[ { device = "/dev/disk/by-uuid/7ca217d6-538e-4919-a57f-c5cbaeb93832"; }
];


+ 5
- 5
services/dovecot/default.nix View File

@@ -87,9 +87,9 @@ in {
!include ${masterConfig}

# Enable sieve scripts
protocols = $protocols sieve
# protocols = $protocols sieve

plugin {
# plugin {
# location of users' sieve directory and their "active" sieve script
# sieve = file:~/sieve;active=~/.dovecot.sieve

@@ -99,11 +99,11 @@ in {
# sieve_after = /usr/local/etc/dovecot/sieve-after.d

# make sieve aware of user+tag@domain.tld aliases
recipient_delimiter = +
# recipient_delimiter = +

# maximum size of all user's sieve scripts
sieve_quota_max_storage = 10M
}
# sieve_quota_max_storage = 10M
# }
'';
};
}

+ 21
- 1
services/gluster.nix View File

@@ -1,3 +1,4 @@
{ pkgs, ... }:
{
services.glusterfs = {
enable = true;
@@ -7,6 +8,24 @@

services.nfs.server.enable = true;

nixpkgs.overlays = [
(self: super: {

glusterfs = super.glusterfs.overrideAttrs (oldAttrs: {
separateDebugInfo = true;
name = "glusterfs-7.0";
version = "7.0rc3";
meta.version = "7.0rc3";
src = self.fetchFromGitHub {
owner = "gluster";
repo = "glusterfs";
rev = "bac5d7d60d14a190217fcd84fd0803a4d6a2e37d";
sha256 = "1y2q0jpnj3z9pwx1azh6ls2x0ciqnfja0vczj0xp9v83l2a6qa02";
};
});
})
];

# For each brick open port 49152 + brick_num
# Our nodes have 3 bricks
# Opening a heap of ports to make things easier in the future
@@ -15,7 +34,8 @@
111 2049 4045 24007 24008 38465 38466 38467
49152 49153 49154 49155 49156 49157
49158 49159 49160 49161 49162 49163
49164 49165 49166
49164 49165 49166 49167 49168 49169 49170
20048
];
networking.firewall.allowedUDPPorts = [ 111 2049 4045 ];
}

+ 3
- 4
services/postfix/default.nix View File

@@ -31,7 +31,7 @@ in {
setSendmail = true;
origin = common.tld;
hostname = "mail.${common.tld}";
destination = ["mail.${common.tld}" "localhost"];
destination = [common.tld "localhost"];
recipientDelimiter = "+";

sslCert = "${common.certsDir}/${common.tld}/fullchain.pem";
@@ -55,13 +55,12 @@ in {
# IP address used by postfix to send outgoing mail. You only need this if
# your machine has multiple IP addresses - set it to your MX address to
# satisfy your SPF record.
# TODO allow this machine to connect to public addresses to send mail
smtp_bind_address = "192.168.0.135";
# http://www.postfix.org/BASIC_CONFIGURATION_README.html#proxy_interfaces
proxy_interfaces = "136.206.15.5";

virtual_mailbox_domains = "${common.tld}";
virtual_mailbox_maps = "hash:/var/lib/postfix/aliases";
#virtual_mailbox_domains = "${common.tld}";
#virtual_mailbox_maps = "hash:/var/lib/postfix/aliases";
# virtual_alias_maps = "ldap:" ++ ./ldap-virtual-alias-maps.cf;

# Generate own DHParams


+ 1
- 0
services/ssh.nix View File

@@ -5,6 +5,7 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPR+OTAIYr02f/WKQSXo7zYy9tkuAHYpy0ajqY6aJ7Nk m1cr0man@redbrick.dcu.ie"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDYKnYP4Mmyk4wQE7J6Tyr27XToKtxAhXBZr5HkEXiFq root@gelandewagen"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvabMrrJILDua2sedVqBStb6YKBHpgCO5HOM98l7uwf greenday@DESKTOP-NJVR3G4"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjro8OS7cWf6xBcrs4erZqjN5JdztoGqpMXFQwzd9pV mctastic@azazel"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLSLIF2IOo/OzbmbMGp4kt6VP2z8zNCuuVNyuxyBU0A8cOeUhkAbVibVmFqPlcHDJ4+zhkNN0GDnEJEUAmBNi+yc9EJG7StxdguEAKPlA9gQ/Z73cMrfMHtTPOHj/uCKUqi9vzb3tlOltJmuS3SwF0B5dk58j/cwr3nEEzikMmQIykxI+F+rxMnxaQXtNBGz3ednAaJ4Lvv9JSxWcExEtU0lM0X1MgZgkYFr48uQwsDUE+j23+wifMrOA+zhC0uRcuIapnxsyoW/wDOYrQZFlw6acrVX+zNtxcCQoqIX4oAobCXn7tYz9peKrV8TmJwQOspsmyY75xIAbyz0AiD3oh kyle@HP-Kyle"
];
}

Loading…
Cancel
Save