directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r643034 - in /directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main: java/org/apache/directory/daemon/installers/deb/ java/org/apache/directory/daemon/installers/rpm/ resources/org/apache/directory/daemon...
Date Mon, 31 Mar 2008 15:43:08 GMT
Author: pamarcelot
Date: Mon Mar 31 08:43:00 2008
New Revision: 643034

URL: http://svn.apache.org/viewvc?rev=643034&view=rev
Log:
Fixed .deb package. The Debian installer now install an ApacheDS that runs under the 'apacheds'
user.

Modified:
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
    directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java?rev=643034&r1=643033&r2=643034&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/deb/DebInstallerCommand.java
Mon Mar 31 08:43:00 2008
@@ -139,6 +139,7 @@
         new File( debDefaultInstanceDirectory, "run" ).mkdirs();
         File debEtcInitdDirectory = new File( debDirectory, "etc/init.d" );
         debEtcInitdDirectory.mkdirs();
+        new File( debDirectory, "/var/run/apacheds-" + target.getApplication().getVersion()
).mkdirs();
         try
         {
             // Copying the apacheds.conf file in the default instance conf directory
@@ -238,7 +239,7 @@
         {
             filterProperties.put( "app.version", "1.0" );
         }
-        filterProperties.put( "arch", target.getOsArch());
+        filterProperties.put( "arch", target.getOsArch() );
     }
 
 

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java?rev=643034&r1=643033&r2=643034&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/java/org/apache/directory/daemon/installers/rpm/RpmInstallerCommand.java
Mon Mar 31 08:43:00 2008
@@ -138,7 +138,10 @@
         // because the compiler may be installed in different places and is specific
         if ( !target.getRpmBuilder().exists() )
         {
-            throw new MojoFailureException( "Cannot find rpmbuild: " + target.getRpmBuilder()
);
+            log.warn( "Cannot find rpmbuild utility at this location: " + target.getRpmBuilder()
);
+            log.warn( "The build will continue, but please check the location of your rpmbuild
" );
+            log.warn( "utility." );
+            return;
         }
         else
         {

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init?rev=643034&r1=643033&r2=643034&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/apacheds-init
Mon Mar 31 08:43:00 2008
@@ -46,7 +46,7 @@
 PRIORITY=
 
 # Location of the pid file.
-PIDDIR="/var/run"
+PIDDIR="/var/run/@app@-@app.version@"
 
 # If uncommented, causes the Wrapper to be shutdown using an anchor file.
 #  When launched with the 'start' command, it will also ignore all INT and
@@ -61,8 +61,7 @@
 # NOTE - This will set the user which is used to run the Wrapper as well as
 #  the JVM and is not useful in situations where a privileged resource or
 #  port needs to be allocated prior to the user being changed.
-#RUN_AS_USER=$APP_NAME
-RUN_AS_USER=root
+RUN_AS_USER=$APP_NAME
 
 # Do not modify anything beyond this point
 #-----------------------------------------------------------------------------
@@ -139,7 +138,7 @@
 
 # Process ID
 ANCHORFILE="$PIDDIR/@app@-@app.version@-$INSTANCE.anchor"
-PIDFILE="$PIDDIR/@app@-@app.version@-$INSTANCE.pid"
+PIDFILE="$PIDDIR/$INSTANCE.pid"
 LOCKDIR="/var/lock/subsys"
 LOCKFILE="$LOCKDIR/$INSTANCE"
 pid=""

Modified: directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
URL: http://svn.apache.org/viewvc/directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst?rev=643034&r1=643033&r2=643034&view=diff
==============================================================================
--- directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
(original)
+++ directory/sandbox/pamarcelot/trunks/apacheds-additional-installers/daemon/plugin/src/main/resources/org/apache/directory/daemon/installers/deb/postinst
Mon Mar 31 08:43:00 2008
@@ -2,5 +2,11 @@
 set -e
 
 # Setting executable permissions
-chmod o+x /opt/apacheds-${app.version}/bin/apacheds
-chmod o+x /etc/init.d/apacheds-${app.version}-default
\ No newline at end of file
+chmod +x /opt/apacheds-${app.version}/bin/apacheds
+chmod +x /etc/init.d/apacheds-${app.version}-default
+
+# Modifying owner
+chown -R apacheds:apacheds /opt/apacheds-${app.version}
+chown -R apacheds:apacheds /var/lib/apacheds-${app.version}
+chown apacheds:apacheds /var/run/apacheds-${app.version}
+chown root:root /etc/init.d/apacheds-${app.version}-default
\ No newline at end of file



Mime
View raw message