camelCase

mail-server/clamav.nix

@@ -20,7 +20,7 @@ let
   cfg = config.mailserver;
 in
 {
-  config = lib.mkIf cfg.virus_scanning {
+  config = lib.mkIf cfg.virusScanning {
     services.clamav.daemon.enable = true;
     services.clamav.updater.enable = true;
   };

mail-server/dovecot.nix

@@ -14,27 +14,27 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ vmail_group_name, vmail_user_name, mail_dir, enable_imap, enable_pop3, cert,
+{ vmailGroupName, vmailUserName, mailDirectory, enable_imap, enable_pop3, cert,
 key }:
 
 let
   # maildir in format "/${domain}/${user}/"
-  dovecot_maildir = "maildir:${mail_dir}/%d/%n/";
+  dovecot_maildir = "maildir:${mailDirectory}/%d/%n/";
 
 in
 {
   enable = true;
   enableImap = enable_imap;
   enablePop3 = enable_pop3;
-  mailGroup = vmail_group_name;
-  mailUser = vmail_user_name;
+  mailGroup = vmailGroupName;
+  mailUser = vmailUserName;
   mailLocation = dovecot_maildir;
   sslServerCert = cert;
   sslServerKey = key;
   enableLmtp = true;
   extraConfig = ''
     #Extra Config
-    mail_access_groups = ${vmail_group_name}
+    mail_access_groups = ${vmailGroupName}
     ssl = required
 
     service lmtp {

mail-server/environment.nix

@@ -14,10 +14,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ pkgs, certificate_scheme }:
+{ pkgs, certificateScheme }:
 
 {
   systemPackages = with pkgs; [
     dovecot opendkim openssh postfix clamav rspamd rmilter
-  ] ++ (if certificate_scheme == 2 then [ openssl ] else []);
+  ] ++ (if certificateScheme == 2 then [ openssl ] else []);
 }

mail-server/networking.nix

@@ -14,10 +14,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ domain, host_prefix, enable_imap, enable_pop3 }:
+{ domain, hostPrefix, enable_imap, enable_pop3 }:
 
 {
-  #hostName = "${host_prefix}.${domain}";
+  #hostName = "${hostPrefix}.${domain}";
 
   firewall = {
     enable = true;

mail-server/postfix.nix

@@ -14,15 +14,15 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ lib, mail_dir, domain, valiases, cert, key }:
+{ lib, mailDirectory, domain, virtualAliases, cert, key }:
 
 let
   # valiases_postfix :: [ String ]
   valiases_postfix = map
     (from:
-      let to = valiases.${from};
+      let to = virtualAliases.${from};
       in "${from}@${domain} ${to}@${domain}")
-    (builtins.attrNames valiases);
+    (builtins.attrNames virtualAliases);
 
   # valiases_file :: Path
   valiases_file = builtins.toFile "valias" (lib.concatStringsSep "\n" valiases_postfix);
@@ -60,7 +60,7 @@ in
     # virtual mail system
     virtual_uid_maps = static:5000
     virtual_gid_maps = static:5000
-    virtual_mailbox_base = ${mail_dir}
+    virtual_mailbox_base = ${mailDirectory}
     virtual_mailbox_domains = ${vhosts_file}
     virtual_alias_maps = hash:/var/lib/postfix/conf/valias
     virtual_transport = lmtp:unix:private/dovecot-lmtp

mail-server/rmilter.nix

@@ -14,10 +14,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ domain, virus_scanning, dkim_signing, dkim_dir, dkim_selector }:
+{ domain, virusScanning, dkim_signing, dkim_dir, dkim_selector }:
 
 let
-  clamav = if virus_scanning
+  clamav = if virusScanning
            then
            ''
              clamav {

mail-server/services.nix

@@ -14,22 +14,22 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ lib, mail_dir, vmail_user_name, vmail_group_name, valiases, domain, enable_imap,
-enable_pop3, virus_scanning, dkim_signing, dkim_selector, dkim_dir,
-certificate_scheme, cert_file, key_file, cert_dir }:
+{ lib, mailDirectory, vmailUserName, vmailGroupName, virtualAliases, domain, enable_imap,
+enable_pop3, virusScanning, dkim_signing, dkim_selector, dkim_dir,
+certificateScheme, certificateFile, keyFile, cert_dir }:
 
 let
   # cert :: PATH
-  cert = if certificate_scheme == 1
-         then cert_file
-         else if certificate_scheme == 2
+  cert = if certificateScheme == 1
+         then certificateFile
+         else if certificateScheme == 2
               then "${cert_dir}/cert-${domain}.pem"
               else "";
 
   # key :: PATH
-  key = if certificate_scheme == 1
-        then key_file
-        else if certificate_scheme == 2
+  key = if certificateScheme == 1
+        then keyFile
+        else if certificateScheme == 2
              then "${cert_dir}/key-${domain}.pem"
              else "";
 in
@@ -40,15 +40,15 @@ in
   };
 
   rmilter = import ./rmilter.nix {
-    inherit domain virus_scanning dkim_signing dkim_selector dkim_dir;
+    inherit domain virusScanning dkim_signing dkim_selector dkim_dir;
   };
 
   postfix = import ./postfix.nix {
-    inherit lib mail_dir domain valiases cert key;
+    inherit lib mailDirectory domain virtualAliases cert key;
   };
 
   dovecot2 = import ./dovecot.nix {
-    inherit vmail_group_name vmail_user_name mail_dir enable_imap
+    inherit vmailGroupName vmailUserName mailDirectory enable_imap
             enable_pop3 cert key;
   };
 }

mail-server/systemd.nix

@@ -14,15 +14,15 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ pkgs, mail_dir, vmail_group_name, certificate_scheme, cert_dir, host_prefix,
+{ pkgs, mailDirectory, vmailGroupName, certificateScheme, cert_dir, hostPrefix,
 domain, dkim_selector, dkim_dir}:
 
 let
-  create_certificate = if certificate_scheme == 2 then
+  create_certificate = if certificateScheme == 2 then
         ''
           # Create certificates if they do not exist yet
           dir="${cert_dir}"
-          fqdn="${host_prefix}.${domain}"
+          fqdn="${hostPrefix}.${domain}"
           case $fqdn in /*) fqdn=$(cat "$fqdn");; esac
           key="''${dir}/key-${domain}.pem";
           cert="''${dir}/cert-${domain}.pem";
@@ -68,9 +68,9 @@ in
     preStart = 
     ''
       # Create mail directory and set permissions
-      mkdir -p "${mail_dir}"
-      chgrp "${vmail_group_name}" "${mail_dir}"
-      chmod 02770 "${mail_dir}"
+      mkdir -p "${mailDirectory}"
+      chgrp "${vmailGroupName}" "${mailDirectory}"
+      chmod 02770 "${mailDirectory}"
 
       ${create_certificate}
     '';

mail-server/users.nix

@@ -14,35 +14,35 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program. If not, see <http://www.gnu.org/licenses/>
 
-{ lib, vmail_id_start, vmail_user_name, vmail_group_name, domain, mail_dir,
-login_accounts }:
+{ lib, vmailUIDStart, vmailUserName, vmailGroupName, domain, mailDirectory,
+loginAccounts }:
 
 let
   vmail_user = [{
-    name = vmail_user_name;
+    name = vmailUserName;
     isNormalUser = false;
-    uid = vmail_id_start;
-    home = mail_dir;
+    uid = vmailUIDStart;
+    home = mailDirectory;
     createHome = true;
-    group = vmail_group_name;
+    group = vmailGroupName;
   }];
 
   # accountsToUser :: String -> UserRecord
   accountsToUser = account: {
     name = account.name + "@" + domain;
     isNormalUser = false;
-    group = vmail_group_name;
+    group = vmailGroupName;
     inherit (account) hashedPassword;
   };
 
   # mail_user :: [ UserRecord ]
-  mail_user = map accountsToUser (lib.attrValues login_accounts);
+  mail_user = map accountsToUser (lib.attrValues loginAccounts);
 
 in
 {
   # set the vmail gid to a specific value
   groups = {
-    vmail = { gid = vmail_id_start; };
+    vmail = { gid = vmailUIDStart; };
   };
 
   # define all users