* Continued refactoring the tree: moved most Upstart jobs (namely

those that run daemons) to modules/services.  This probably broke
  some things since there are a few relative paths in modules
  (e.g. imports of system/ids.nix).
* Moved some PAM modules out of etc/pam.d to the directories of NixOS
  modules that use them.

svn path=/nixos/branches/modular-nixos/; revision=15717

modules/services/databases/mysql.nix

@@ -0,0 +1,109 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      mysql = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to enable the MySQL server.
+          ";
+        };
+        
+        port = mkOption {
+          default = "3306";
+          description = "Port of MySQL"; 
+        };
+        
+        user = mkOption {
+          default = "mysql";
+          description = "User account under which MySQL runs";
+        };
+        
+        dataDir = mkOption {
+          default = "/var/mysql";
+          description = "Location where MySQL stores its table files";
+        };
+        
+        logError = mkOption {
+          default = "/var/log/mysql_err.log";
+          description = "Location of the MySQL error logfile";
+        };
+        
+        pidDir = mkOption {
+          default = "/var/run/mysql";
+          description = "Location of the file which stores the PID of the MySQL server";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+
+  cfg = config.services.mysql;
+
+  mysql = pkgs.mysql;
+
+  pidFile = "${cfg.pidDir}/mysqld.pid";
+
+  mysqldOptions =
+    "--user=${cfg.user} --datadir=${cfg.dataDir} " +
+    "--log-error=${cfg.logError} --pid-file=${pidFile}";
+
+in
+
+
+mkIf config.services.mysql.enable {
+  require = [
+    options
+  ];
+
+  users = {
+    extraUsers = [
+      { name = "mysql";
+        description = "MySQL server user";
+      }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "mysql";
+      
+
+      extraPath = [mysql];
+      
+      job = ''
+        description "MySQL server"
+
+        stop on shutdown
+
+        start script
+            if ! test -e ${cfg.dataDir}; then
+                mkdir -m 0700 -p ${cfg.dataDir}
+                chown -R ${cfg.user} ${cfg.dataDir}
+                ${mysql}/bin/mysql_install_db ${mysqldOptions}
+            fi
+
+            mkdir -m 0700 -p ${cfg.pidDir}
+            chown -R ${cfg.user} ${cfg.pidDir}
+        end script
+
+        respawn ${mysql}/bin/mysqld ${mysqldOptions}
+
+        stop script
+            pid=$(cat ${pidFile})
+            kill "$pid"
+            ${mysql}/bin/mysql_waitpid "$pid" 1000
+        end script
+      '';
+    }];
+  };
+}

modules/services/databases/postgresql.nix

@@ -0,0 +1,135 @@
+{pkgs, config, ...}:
+
+###### interface
+let
+  inherit (pkgs.lib) mkOption mkIf;
+
+  options = {
+    services = {
+      postgresql = {
+        enable = mkOption {
+          default = false;
+          description = "
+            Whether to run PostgreSQL.
+          ";
+        };
+        port = mkOption {
+          default = "5432";
+          description = "
+            Port for PostgreSQL.
+          ";
+        };
+        logDir = mkOption {
+          default = "/var/log/postgresql";
+          description = "
+            Log directory for PostgreSQL.
+          ";
+        };
+        dataDir = mkOption {
+          default = "/var/db/postgresql";
+          description = "
+            Data directory for PostgreSQL.
+          ";
+        };
+        subServices = mkOption {
+          default = [];
+          description = "
+            Subservices list. As it is already implememnted, 
+            here is an interface...
+          ";
+        };
+        authentication = mkOption {
+          default = ''
+            # Generated file; do not edit!
+            local all all              ident sameuser
+            host  all all 127.0.0.1/32 md5
+            host  all all ::1/128      md5
+          '';
+          description = "
+            Hosts (except localhost), who you allow to connect.
+          ";
+        };
+        allowedHosts = mkOption {
+          default = [];
+          description = "
+            Hosts (except localhost), who you allow to connect.
+          ";
+        };
+        authMethod = mkOption {
+          default = " ident sameuser ";
+          description = "
+            How to authorize users. 
+            Note: ident needs absolute trust to all allowed client hosts.";
+        };
+        enableTCPIP = mkOption {
+          default = false;
+          description = "
+            Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
+          ";
+        };
+      };
+    };
+  };
+in
+
+###### implementation
+
+let
+
+  cfg = config.services.postgresql;
+
+  postgresql = pkgs.postgresql;
+
+  startDependency = if config.services.gw6c.enable then 
+    "gw6c" else "network-interfaces";
+
+  run = "${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh postgres";
+
+  flags = if cfg.enableTCPIP then ["-i"] else [];
+
+in
+
+mkIf config.services.postgresql.enable {
+  require = [
+    options
+  ];
+
+
+  users = {
+    extraUsers = [
+      { name = "postgres";
+        description = "PostgreSQL server user";
+      }
+    ];
+
+    extraGroups = [
+      { name = "postgres"; }
+    ];
+  };
+
+  services = {
+    extraJobs = [{
+      name = "postgresql";
+
+      extraPath = [postgresql];
+
+      job = ''
+        description "PostgreSQL server"
+
+        start on ${startDependency}/started
+        stop on shutdown
+        
+        start script
+            if ! test -e ${cfg.dataDir}; then
+                mkdir -m 0700 -p ${cfg.dataDir}
+                chown -R postgres ${cfg.dataDir}
+                ${run} -c '${postgresql}/bin/initdb -D ${cfg.dataDir} -U root'
+            fi
+            cp -f ${pkgs.writeText "pg_hba.conf" cfg.authentication} ${cfg.dataDir}/pg_hba.conf
+        end script
+
+        respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'
+      '';
+      }];
+  };
+}