strip trailing whitespace; no functional change

svn path=/nixos/trunk/; revision=29285

modules/services/databases/4store-endpoint.nix

@@ -10,9 +10,9 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.fourStoreEndpoint = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable 4Store SPARQL endpoint.";
@@ -68,5 +68,5 @@ with pkgs.lib;
     };
 
   });
-  
+
 }

modules/services/databases/4store.nix

@@ -11,9 +11,9 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.fourStore = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable 4Store RDF database server.";
@@ -67,5 +67,5 @@ with pkgs.lib;
     };
 
   });
-  
+
 }

modules/services/databases/mysql.nix

@@ -35,9 +35,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.mysql = {
-    
+
       enable = mkOption {
         default = false;
         description = "
@@ -54,7 +54,7 @@ in
 
       port = mkOption {
         default = "3306";
-        description = "Port of MySQL"; 
+        description = "Port of MySQL";
       };
 
       user = mkOption {
@@ -75,8 +75,8 @@ in
       pidDir = mkOption {
         default = "/var/run/mysql";
         description = "Location of the file which stores the PID of the MySQL server";
-      };           
-      
+      };
+
       initialDatabases = mkOption {
         default = [];
         description = "List of database names and their initial schemas that should be used to create databases on the first startup of MySQL";
@@ -85,47 +85,47 @@ in
 	  { name = "bardatabase"; schema = ./bardatabase.sql; }
 	];
       };
-      
+
       initialScript = mkOption {
         default = null;
 	description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database";
       };
-      
+
       rootPassword = mkOption {
         default = null;
-	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";	
+	description = "Path to a file containing the root password, modified on the first startup. Not specifying a root password will leave the root password empty.";
       };
-      
+
       replication = {
         role = mkOption {
 	  default = "none";
 	  description = "Role of the MySQL server instance. Can be either: master, slave or none";
 	};
-	
+
         serverId = mkOption {
 	  default = 1;
 	  description = "Id of the MySQL server instance. This number must be unique for each instance";
 	};
-	
+
 	masterHost = mkOption {
 	  description = "Hostname of the MySQL master server";
 	};
-	
+
 	masterUser = mkOption {
 	  description = "Username of the MySQL replication user";
 	};
-	
+
 	masterPassword = mkOption {
 	  description = "Password of the MySQL replication user";
 	};
-	
+
 	masterPort = mkOption {
 	  default = 3306;
 	  description = "Port number on which the MySQL master server runs";
 	};
       };
     };
-    
+
   };
 
 
@@ -159,7 +159,7 @@ in
           '';
 
         exec = "${mysql}/libexec/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
-	
+
 	postStart =
 	  ''
             # Wait until the MySQL server is available for use
@@ -181,7 +181,7 @@ in
 	    then
 	        # Create initial databases
 
-                ${concatMapStrings (database: 
+                ${concatMapStrings (database:
                   ''
                     if ! test -e "${cfg.dataDir}/${database.name}"; then
                         echo "Creating initial database: ${database.name}"
@@ -196,17 +196,17 @@ in
 		          fi
 		        ) | ${mysql}/bin/mysql -u root -N
                     fi
-                  '') cfg.initialDatabases}            
-	
+                  '') cfg.initialDatabases}
+
 	        # Execute initial script
-		
+
 		${optionalString (cfg.initialScript != null)
 		  ''
 		    cat ${cfg.initialScript} | ${mysql}/bin/mysql -u root -N
 		  ''}
-		
+
 	        # Change root password
-		
+
 		${optionalString (cfg.rootPassword != null)
 		  ''
 		    ( echo "use mysql;"
@@ -214,11 +214,11 @@ in
 		      echo "flush privileges;"
 		    ) | ${mysql}/bin/mysql -u root -N
 		  ''}
-		  
+
 	      rm /tmp/mysql_init
 	    fi
 	  '';
-	  	  
+
         # !!! Need a postStart script to wait until mysqld is ready to
         # accept connections.
 

modules/services/databases/openldap.nix

@@ -16,9 +16,9 @@ in
   ###### interface
 
   options = {
-  
+
     services.openldap = {
-    
+
       enable = mkOption {
         default = false;
         description = "
@@ -33,7 +33,7 @@ in
         ";
       };
     };
-    
+
   };
 
 

modules/services/databases/postgresql.nix

@@ -33,46 +33,46 @@ let
       ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}'
       log_destination = 'syslog'
       ${cfg.extraConfig}
-    '';  
+    '';
 
 in
 
 {
 
   ###### interface
-  
+
   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.
         '';
       };
-      
+
       authentication = mkOption {
         default = ''
           # Generated file; do not edit!
@@ -85,22 +85,22 @@ in
           Defines how users authenticate themselves to the server.
         '';
       };
-      
+
       identMap = mkOption {
         default = "";
         description = ''
           Defines the mapping from system users to database users.
         '';
       };
-      
+
       authMethod = mkOption {
         default = " ident sameuser ";
         description = ''
-          How to authorize users. 
+          How to authorize users.
           Note: ident needs absolute trust to all allowed client hosts.
         '';
       };
-      
+
       enableTCPIP = mkOption {
         default = false;
         description = ''
@@ -122,7 +122,7 @@ in
         # So a nicer solution was patching postgresql to allow setting the
         # libdir explicitely.
       };
-      
+
       extraConfig = mkOption {
         default = "";
         description = "Additional text to be appended to <filename>postgresql.conf</filename>.";
@@ -133,7 +133,7 @@ in
 
 
   ###### implementation
-  
+
   config = mkIf config.services.postgresql.enable {
 
     users.extraUsers = singleton
@@ -196,5 +196,5 @@ in
       };
 
   };
-  
+
 }

modules/services/databases/virtuoso.nix

@@ -10,9 +10,9 @@ with pkgs.lib;
   ###### interface
 
   options = {
-  
+
     services.virtuoso = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable Virtuoso Opensource database server.";
@@ -94,5 +94,5 @@ with pkgs.lib;
     '';
 
   };
-  
+
 }