summary refs log tree commit diff
path: root/modules/services/misc/felix.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-09-14 18:20:50 +0000
committerPeter Simons <simons@cryp.to>2011-09-14 18:20:50 +0000
commiteb6e1310b8774f3aed4c5675d09708f0df6199d3 (patch)
tree3297542b3cda78d38731abb65837f4553cd377a9 /modules/services/misc/felix.nix
parentf5e8d35f8e76755febf97ca8f62b0700a8b6d20a (diff)
downloadnixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.gz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.bz2
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.lz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.xz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.zst
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.zip
strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
Diffstat (limited to 'modules/services/misc/felix.nix')
-rw-r--r--modules/services/misc/felix.nix32
1 files changed, 16 insertions, 16 deletions
diff --git a/modules/services/misc/felix.nix b/modules/services/misc/felix.nix
index f05abc38f08..2da50fc8595 100644
--- a/modules/services/misc/felix.nix
+++ b/modules/services/misc/felix.nix
@@ -12,16 +12,16 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.felix = {
-    
+
       enable = mkOption {
         default = false;
         description = "Whether to enable the Apache Felix OSGi service";
       };
-      
+
       bundles = mkOption {
         default = [ pkgs.felix_remoteshell ];
         description = "List of bundles that should be activated on startup";
@@ -30,17 +30,17 @@ in
       user = mkOption {
         default = "osgi";
         description = "User account under which Apache Felix runs.";
-      };      
+      };
 
       group = mkOption {
         default = "osgi";
         description = "Group account under which Apache Felix runs.";
-      };      
-      
+      };
+
     };
-    
+
   };
-  
+
 
   ###### implementation
 
@@ -49,7 +49,7 @@ in
       { name = "osgi";
         gid = config.ids.gids.osgi;
       };
-      
+
     users.extraUsers = singleton
       { name = "osgi";
         uid = config.ids.uids.osgi;
@@ -60,16 +60,16 @@ in
     jobs.felix =
       { description = "Felix server";
 
-        preStart = 
+        preStart =
 	  ''
 	    # Initialise felix instance on first startup
 	    if [ ! -d /var/felix ]
 	    then
 	        # Symlink system files
-		
+
 	        mkdir -p /var/felix
 		chown ${cfg.user}:${cfg.group} /var/felix
-		
+
 		for i in ${pkgs.felix}/*
 		do
 		    if [ "$i" != "${pkgs.felix}/bundle" ]
@@ -77,11 +77,11 @@ in
 		        ln -sfn $i /var/felix/$(basename $i)
 		    fi
 		done
-		
+
 		# Symlink bundles
 		mkdir -p /var/felix/bundle
 		chown ${cfg.user}:${cfg.group} /var/felix/bundle
-		
+
 		for i in ${pkgs.felix}/bundle/* ${toString cfg.bundles}
 		do
 		    if [ -f $i ]
@@ -97,7 +97,7 @@ in
 		done
 	    fi
 	  '';
-	  
+
         script =
           ''
 	    cd /var/felix