trinidad_init_services 1.1.3 → 1.1.4

data/.gitignore

@@ -0,0 +1,5 @@
+pkg
+trinidad-daemon.sh
+.idea
+nbproject
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,3 @@
+source :rubygems
+
+gemspec

data/History.txt

@@ -1,3 +1,9 @@
+== 1.1.4 (2012-03-01)
+
+* JSVC sources packaged along the gem and compiled on demand (@see #6)
+* Improve JRuby's native path detection in generated init.d script
+* Make gem usable with bundler :git => paths
+
 == 1.1.3 (2012-02-20)
 
 * Do not ask for a path with $RUN_USER.

data/README.md

@@ -0,0 +1,95 @@
+# Trinidad Init Services
+
+Trinidad's init services based on Apache [commons daemon](http://commons.apache.org/daemon/)
+and [jruby-jsvc](https://github.com/nicobrevin/jruby-jsvc). Works on Unix and Windows systems.
+
+## Installation
+
+    $ jruby -S gem install trinidad_init_services
+
+When the gem is installed the user must launch the installation process:
+
+    $ jruby -S trinidad_init_service
+
+This installer guides you through the configuration process and generates a
+init.d script if you are on a unix system or creates the service if you are
+on a windows box.
+
+You can optionally provide a configuration file to the trinidad_init_service
+command. An example configuration file might look like this:
+
+    app_path: "/home/myuser/app"
+    trinidad_options: "-e production"
+    jruby_home: "/opt/jruby"
+    ruby_compat_version: RUBY1_8
+    trinidad_name: Trinidad
+    jsvc_path: "/usr/bin/jsvc"
+    java_home: "/opt/java"
+    output_path: "/etc/init.d"
+    pid_file: "/tmp/trinidad.pid"
+    log_file: "/tmp/trinidad.log"
+
+You can then run the installer like so:
+
+    $ jruby -S trinidad_init_service trinidad_init_config.yml
+
+If any of the required options are not provided in the configuration file, then 
+the installer will prompt you for them.
+
+
+### Unix
+
+#### Requirements
+
+To run Trinidad as a daemon [jsvc](http://commons.apache.org/daemon/jsvc.html) is
+used. Some distributions provide binary packages of JSVC but not all, for these
+we do bundle JSVC's sources and try to compile the binary during configuration for
+you. However please note that to build JSVC on Unix you will need :
+
+* an ANSI-C compliant compiler (GCC is good) and GNU Make
+* Java SDK installed (a JRE installation is not enough)
+
+#### Execution
+
+When the installation process finishes you can use the script generated to launch 
+the server as a daemon with the options start|stop|restart, i.e:
+
+    $ /etc/init.d/trinidad restart
+
+#### Running as a Non-Root User
+
+By default, the Trinidad server process will run as the same user that ran the 
+`/etc/init.d/trinidad start` command. But the service can be configured to run 
+as a different user. The preferred method for doing this is the `run_user:` 
+attribute in the configuration YAML (or it's corresponding value at the prompt).  
+For example:
+
+    app_path: "/home/myuser/app"
+    trinidad_options: "-e production"
+    jruby_home: "/opt/jruby"
+    run_user: myuser
+    ...
+
+This causes the the server to run with non-root privileges (it essentially executes 
+as `sudo -u run_user jsvc ...`).
+
+On some platforms, however, it may be required that you use the JSVC `-user` argument.
+This can be configured with the `JSVC_ARGS_EXTRA` environment variable, like this:
+
+    JSVC_ARGS_EXTRA="-user myuser" /etc/init.d/trinidad start
+
+It not recommended that you mix the `-user` flag with the `run_user` option !
+
+
+### Windows
+
+#### Execution
+
+Open the **Services** panel under **Administrative Tools** and look for a service 
+called **Trinidad**.
+
+
+## Copyright
+
+Copyright (c) 2011-2012 David Calavera<calavera@apache.org>. 
+See LICENSE for details.

data/Rakefile

@@ -12,17 +12,11 @@ def name
   @name ||= Dir['*.gemspec'].first.split('.').first
 end
 
-def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def date
-  Date.today.to_s
-end
+$:.push File.expand_path("../lib", __FILE__)
 
-def rubyforge_project
-  name
+def version
+  require 'trinidad_init_services/version'
+  Trinidad::InitServices::VERSION
 end
 
 def gemspec_file
@@ -33,31 +27,17 @@ def gem_file
   "#{name}-#{version}.gem"
 end
 
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
 #############################################################################
 #
 # Standard tasks
 #
 #############################################################################
 
-task :default => :test
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+task :default => :spec
 
-desc "Generate RCov test coverage and open in your browser"
-task :coverage do
-  require 'rcov'
-  sh "rm -fr coverage"
-  sh "rcov test/test_*.rb"
-  sh "open coverage/index.html"
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ['--color', "--format documentation"]
 end
 
 require 'rake/rdoctask'
@@ -101,7 +81,7 @@ task :release => :build do
 end
 
 desc 'Build gem'
-task :build => :gemspec do
+task :build => :validate do
   sh "mkdir -p pkg"
   sh "gem build #{gemspec_file}"
   sh "mv #{gem_file} pkg"
@@ -112,35 +92,6 @@ task :install => :build do
   sh "gem install pkg/#{gem_file}"
 end
 
-desc 'Create gemspec'
-task :gemspec => :validate do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  #comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
-end
-
 task :validate do
   libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
   unless libfiles.empty?

data/bin/trinidad_init_service

@@ -1,11 +1,10 @@
 #!/usr/bin/env jruby
 
-require 'trinidad_init_services/configuration'
-require 'yaml'
+require 'trinidad_init_services'
 
 if ARGV.size > 0
-  config_file = File.read(ARGV[0])
-  config = YAML.load(config_file)
+  require 'yaml'
+  config = YAML.load File.read(ARGV[0])
   Trinidad::InitServices::Configuration.new.configure(config)
 else
   Trinidad::InitServices::Configuration.new.configure

data/init.d/trinidad.erb

@@ -10,8 +10,6 @@
 # Things you can set:
 # PROG_OPTS - Arguments to send to the program. A few defaults are appended to this.
 
-# Path to the jsvc binary, if you're having issues with the pre-compiled binary
-# try installing it (e.g. apt-get install jsvc) or compiling it yourself :
 # https://github.com/trinidad/trinidad_init_services/wiki/Installing-JSVC
 JSVC=<%= @jsvc %>
 JAVA_HOME=<%= @java_home %>
@@ -43,18 +41,42 @@ if [ -z "$JRUBY_OPTS" ] ; then
   JRUBY_OPTS=""
 fi
 
-# TODO: Allow configuration or detect from the OS
-JAVA_NATIVE_PROPS="-Djna.boot.library.path=$JRUBY_HOME/lib/native/linux-i386:$JRUBY_HOME/lib/native/linux-amd64 \
-  -Djffi.boot.library.path=$JRUBY_HOME/lib/native/i386-Linux:$JRUBY_HOME/lib/native/s390x-Linux:$JRUBY_HOME/lib/native/x86_64-Linux"
+JRUBY_SHELL=/bin/sh
+
+JRUBY_NATIVE_PATH=""
+if [ -d "$JRUBY_HOME/lib/native/" ]; then
+  for d in $JRUBY_HOME/lib/native/*`uname -s`; do
+    if [ -z "$JRUBY_NATIVE_PATH" ]; then
+      JRUBY_NATIVE_PATH="$d"
+    else
+      JRUBY_NATIVE_PATH="$JRUBY_NATIVE_PATH:$d"
+    fi
+  done
+fi
+
+if [ -z "$JAVA_MEM" ] ; then
+  JAVA_MEM=500m
+fi
+
+if [ -z "$JAVA_STACK" ] ; then
+  JAVA_STACK=2048k
+fi
+
+JAVA_OPTS="-Xmx${JAVA_MEM} -Xss${JAVA_STACK} -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
 
-JAVA_PROPS="$JAVA_PROPS -Djruby.memory.max=500m \
-  -Djruby.stack.max=1024k \
-  $JAVA_NATIVE_PROPS \
-  -Djruby.shell=/bin/sh \
+# force file.encoding to UTF-8 :
+if [[ -z "$JAVA_ENCODING" ]]; then
+  JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8"
+fi
+
+JAVA_PROPS="$JAVA_PROPS \
+  -Djruby.memory.max=$JAVA_MEM \
+  -Djruby.stack.max=$JAVA_STACK \
+  -Djruby.shell=$JRUBY_SHELL \
+  -Djffi.boot.library.path=$JRUBY_NATIVE_PATH \
   <%= @jruby_opts.join(' ') %> \
   $JRUBY_OPTS"
-
-JAVA_OPTS="-Xmx500m -Xss1024k -Xbootclasspath/a:$JRUBY_HOME/lib/jruby.jar"
+  
 PROC_NAME=${SCRIPT_NAME:-${APP_NAME:-"trinidad"}}
 
 JSVC_ARGS="-home $JAVA_HOME \
@@ -139,4 +161,3 @@ case "$1" in
       echo "Unrecognised command. Usage trinidad [ start | stop | restart ]"
       ;;
 esac
-

data/jsvc-unix-src/CHANGES.txt

@@ -0,0 +1,62 @@
+             APACHE COMMONS DAEMON (UNIX) CHANGELOG:
+
+Changes with 1.0.10
+  * Fix dynamic libcap loading for some linux ditributions (DAEMON-242)
+
+Changes with 1.0.9
+  * Dynamically load libcap on linux (DAEMON-234)
+
+Changes with 1.0.8
+  * Better detection of JDK (DAEMON-220)
+  * Use CPPFLAGS in makefile (DAEMON-223)
+  * Add -umask parameter (DAEMON-221)
+  * Add /etc/alternatives to the location search (DAEMON-224)
+
+Changes with 1.0.7
+
+
+Changes with 1.0.6
+  * Fix syslog infinite loop (DAEMON-194)
+  * Fix syslog invalid descriptors (DAEMON-186)
+
+Changes with 1.0.5
+
+
+Changes with 1.0.4
+  * Add DaemonWrapper to allow running standard applications
+    as daemons. (DAEMON-180)
+  * Support log rotation using SIGUSR1 (DAEMON-95)
+  * Fix FreeBSD build (DAEMON-171)
+  * Add support for config.nice and strip utility (DAEMON-176)
+
+Changes with 1.0.3
+  * Implement fail() method (DAEMON-128)
+  * Add missing Java6 parameters (DAEMON-140)
+
+Changes with 1.0.2
+  * Allow support for OS/X 10.6 (DAEMON-129)
+  * Prunmgr shows wrong default logging level (DAEMON-132)
+  * Allon non ASCII characters in classpath (DAEMON-130)
+  * Log on tab of Prunmgr ignores current settings (DAEMON-126)
+  * Unable to open directory /proc/self/fd (DAEMON-120)
+  * Read Java parameters for Java mode in the same way as JVM mode (DAEMON-119)
+  * Allow running jsvc should as non root (DAEMON-93)
+  * Support all the standard Java 5 launcher options (DAEMON-84)
+  * Support compilation on Cygwin (DAEMON-40)
+  * Add Support for AIX (DAEMON-123)
+  * Fix default log path (DAEMON-116)
+  * Wait for JVM clean exit (DAEMON-97)
+
+Changes with 1.0.1
+  * Allow enableassertions -ea (PR 304310).
+  * Add -lpthread to LDFLAGS on Linux (PR 30177).
+  * Add support for x86_64 (PR 27523).
+  * Add support for Tru64 (PR 29465).
+  * Remove the pid file when son exits correctly (PR 31614).
+  * Add support for JVM-4.1.x on MAC OS X (part of PR 31613).
+  * Prevent starting jsvc several times with the same pidfile (PR 33580).
+  * Finish fixing 31613, automatic detection of JAVA_HOME and headers locations.
+  * -wait and -stop parameters.
+  * fix 34851.
+  * Don't break when set_caps() failed and the user is unchanged (linux).
+

data/jsvc-unix-src/INSTALL.txt

@@ -0,0 +1,81 @@
+To build the service libraries and binary under an UNIX operating
+system you will need:
+
+  An ANSI-C compliant compiler (GCC is good)
+  A Java Platform 2 compliant SDK
+  GNU AutoConf (when building for SVN).
+
+When building from SVN sources you need to build the "configure" program with:
+
+   sh support/buildconf.sh
+(Note it is possible to replace sh by any compatible shell like bash, ksh).
+
+Once the configure script is generated, run it (remember to specify
+either the --with-java=<dir> parameter or set the JAVA_HOME environment
+to point to your JDK installation. For example:
+
+  ./configure --with-java=/usr/java
+
+or
+
+  JAVA_HOME=/usr/java
+  export JAVA_HOME
+  ./configure
+
+Note: On Mac OS X <dir> is /System/Library/Frameworks/JavaVM.framework/Home.
+
+Depending on your JDK layout, configure might fail to find the JNI
+machine dependant include file (jni_md.h). If that's the case use the
+--with-os-type=<subdir> parameter where subdir points to the directory
+within JDK include directory containing jni_md.h file.
+
+
+If your operating system is supported, configure will go thru cleanly,
+otherwise it will report an error (please send us the details of your
+OS/JDK, or a patch against the sources).
+
+To build the binaries and libraries simply do:
+
+  make
+
+This will generate the file:  ./jsvc.
+It should be straightforward from here on. To check the allowed parameters
+for the jsvc binary simply do
+
+  ./native/jsvc -help
+
+Note: On Linux the module capabilities should be loaded, when using -user root
+make sure you REALLY understand what capabilities does (for example for
+files access: the downgraded root may not be able to read some files!).
+
+Making 64-bit binaries
+
+To be able to build the 64-binaries for supported platforms enter the
+specific parameters before calling configure
+
+   export CFLAGS=-m64
+   export LDFLAGS=-m64
+   ./configure
+   make
+
+Making Universal binaries
+
+Some platforms like Mac OSX allow universal or fat binaries that allow
+both 32 and 64 binaries inside the same executable. To be able to build
+the fat binaries enter the specific parameters before calling configure
+
+   export CFLAGS="-arch i386 -arch x86_64"
+   export LDFLAGS="-arch i386 -arch x86_64"
+   ./configure
+   make
+
+Optional Build flags
+
+Make process allows specifying additional compilation flags at compile time
+by using EXTRA_CFLAGS and EXTRA_LDFLAGS either as environment variables
+or defined along the make command line
+
+    make EXTRA_CFLAGS="-march=i586"
+
+will cause -march=i586 to be added to the configure generated CFLAGS.
+The same applies to EXTRA_LDFLAGS which will be added at link stage.

data/jsvc-unix-src/Makedefs.in

@@ -0,0 +1,32 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# @author  Pier Fumagalli <mailto:pier.fumagalli@eng.sun.com>
+# @version $Id: Makedefs.in 1194902 2011-10-29 15:19:18Z mturk $
+
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+INCLUDES = @INCLUDES@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+RANLIB = @RANLIB@
+LDCMD = @LDCMD@
+STRIP = @STRIP@
+
+.c.o:
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) -c $< -o $@