Author: eelco
Date: Wed Apr 27 15:00:43 2011
New Revision: 27002
URL: https://svn.nixos.org/websvn/nix/?rev=27002&sc=1

Log:
* Move the twiki module out of the NixOS tree.

Added:
   services/trunk/twiki/default.nix
      - copied, changed from r26996, 
nixos/trunk/modules/services/web-servers/apache-httpd/twiki.nix

Copied and modified: services/trunk/twiki/default.nix (from r26996, 
nixos/trunk/modules/services/web-servers/apache-httpd/twiki.nix)
==============================================================================
--- nixos/trunk/modules/services/web-servers/apache-httpd/twiki.nix     Wed Apr 
27 14:04:00 2011        (r26996, copy source)
+++ services/trunk/twiki/default.nix    Wed Apr 27 15:00:43 2011        (r27002)
@@ -20,7 +20,7 @@
   defaultUrlHost = "";
 
   # Build the TWiki CGI and configuration files.
-  twikiRoot = (import /etc/nixos/services/twiki/twiki-instance.nix { inherit 
pkgs; }).twiki {
+  twikiRoot = (import ./twiki-instance.nix { inherit pkgs; }).twiki {
     name = "wiki-instance";
     pubdir = pubDir;
     datadir = dataDir;
@@ -30,7 +30,7 @@
     registrationDomain = config.registrationDomain;
   };
 
-  plugins = import /etc/nixos/services/twiki/server-pkgs/twiki-plugins.nix;
+  plugins = import ./server-pkgs/twiki-plugins.nix;
 
 in {
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to