Author: eelco
Date: Fri Oct 8 12:46:22 2010
New Revision: 24181
URL: https://svn.nixos.org/websvn/nix/?rev=24181&sc=1
Log:
* Parameterise jira-instance.nix.
Modified:
services/trunk/jira/jira-instance.nix
Modified: services/trunk/jira/jira-instance.nix
==============================================================================
--- services/trunk/jira/jira-instance.nix Fri Oct 8 10:45:44 2010
(r24180)
+++ services/trunk/jira/jira-instance.nix Fri Oct 8 12:46:22 2010
(r24181)
@@ -1,6 +1,11 @@
-rec {
- pkgs = import ./pkgs/top-level/all-packages.nix {};
+{ pkgs
+, dbHost ? "localhost"
+, dbName ? "jira"
+, dbUser ? "jira"
+, dbPassword
+}:
+rec {
j2re = pkgs.jdk;
ant = pkgs.apacheAnt;
@@ -21,11 +26,11 @@
jira =
(import ./server-pkgs/jira/jira-war.nix) {
dbaccount = {
- database = "jira";
- host = "127.0.0.1";
+ database = dbName;
+ host = dbHost;
port = 5432;
- username = "jira";
- password = "changethis";
+ username = dbUser;
+ password = dbPassword;
};
inherit (pkgs) stdenv fetchurl unzip;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
