Author: eelco
Date: Wed Apr 27 13:33:06 2011
New Revision: 26992
URL: https://svn.nixos.org/websvn/nix/?rev=26992&sc=1
Log:
* Fix the jboss module.
Added:
nixos/trunk/modules/services/web-servers/jboss/
nixos/trunk/modules/services/web-servers/jboss/builder.sh
- copied unchanged from r26990, services/trunk/jboss/builder.sh
nixos/trunk/modules/services/web-servers/jboss/default.nix
- copied, changed from r26984,
nixos/trunk/modules/services/web-servers/jboss.nix
Deleted:
nixos/trunk/modules/services/web-servers/jboss.nix
Modified:
nixos/trunk/modules/module-list.nix
Modified: nixos/trunk/modules/module-list.nix
==============================================================================
--- nixos/trunk/modules/module-list.nix Wed Apr 27 13:32:39 2011 (r26991)
+++ nixos/trunk/modules/module-list.nix Wed Apr 27 13:33:06 2011 (r26992)
@@ -135,7 +135,7 @@
./services/ttys/gpm.nix
./services/ttys/mingetty.nix
./services/web-servers/apache-httpd/default.nix
- #./services/web-servers/jboss.nix
+ ./services/web-servers/jboss/default.nix
./services/web-servers/tomcat.nix
./services/x11/desktop-managers/default.nix
./services/x11/display-managers/auto.nix
Copied: nixos/trunk/modules/services/web-servers/jboss/builder.sh (from r26990,
services/trunk/jboss/builder.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixos/trunk/modules/services/web-servers/jboss/builder.sh Wed Apr 27
13:33:06 2011 (r26992, copy of r26990, services/trunk/jboss/builder.sh)
@@ -0,0 +1,72 @@
+set -e
+
+source $stdenv/setup
+
+mkdir -p $out/bin
+
+cat > $out/bin/control <<EOF
+mkdir -p $logDir
+chown -R $user $logDir
+export PATH=$PATH:$su/bin
+
+start()
+{
+ su $user -s /bin/sh -c "$jboss/bin/run.sh \
+ -Djboss.server.base.dir=$serverDir \
+ -Djboss.server.base.url=file://$serverDir \
+ -Djboss.server.temp.dir=$tempDir \
+ -Djboss.server.log.dir=$logDir \
+ -Djboss.server.lib.url=$libUrl \
+ -c default"
+}
+
+stop()
+{
+ su $user -s /bin/sh -c "$jboss/bin/shutdown.sh -S"
+}
+
+if test "\$1" = start
+then
+ trap stop 15
+
+ start
+elif test "\$1" = stop
+then
+ stop
+elif test "\$1" = init
+then
+ echo "Are you sure you want to create a new server instance (old server
instance will be lost!)?"
+ read answer
+
+ if ! test \$answer = "yes"
+ then
+ exit 1
+ fi
+
+ rm -rf $serverDir
+ mkdir -p $serverDir
+ cd $serverDir
+ cp -av $jboss/server/default .
+ sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml
+
+ if ! test "$useJK" = ""
+ then
+ sed -i -e 's|<attribute name="UseJK">false</attribute>|<attribute
name="UseJK">true</attribute>|'
default/deploy/jboss-web.deployer/META-INF/jboss-service.xml
+ sed -i -e 's|<Engine name="jboss.web" defaultHost="localhost">|<Engine
name="jboss.web" defaultHost="localhost" jvmRoute="node1">|'
default/deploy/jboss-web.deployer/server.xml
+ fi
+
+ # Make files accessible for the server user
+
+ chown -R $user $serverDir
+ for i in \`find $serverDir -type d\`
+ do
+ chmod 755 \$i
+ done
+ for i in \`find $serverDir -type f\`
+ do
+ chmod 644 \$i
+ done
+fi
+EOF
+
+chmod +x $out/bin/*
Copied and modified: nixos/trunk/modules/services/web-servers/jboss/default.nix
(from r26984, nixos/trunk/modules/services/web-servers/jboss.nix)
==============================================================================
--- nixos/trunk/modules/services/web-servers/jboss.nix Wed Apr 27 03:00:47
2011 (r26984, copy source)
+++ nixos/trunk/modules/services/web-servers/jboss/default.nix Wed Apr 27
13:33:06 2011 (r26992)
@@ -1,4 +1,4 @@
-{ config, pkgs, servicesPath, ... }:
+{ config, pkgs, ... }:
with pkgs.lib;
@@ -6,8 +6,10 @@
cfg = config.services.jboss;
- jbossService = import (servicesPath + /jboss) {
- inherit (pkgs) stdenv jboss su;
+ jbossService = pkgs.stdenv.mkDerivation {
+ name = "jboss-server";
+ builder = ./builder.sh;
+ inherit (pkgs) jboss su;
inherit (cfg) tempDir logDir libUrl deployDir serverDir user useJK;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
