cleanup in spec files, maxsessionid in mod_cluster.conf, jgroups upgr…

…ade to 2.6.12.GA, -support upgrade
bobmcwhirter · Aug 19, 2009 · 07daa7f · 07daa7f
1 parent 5d50d36
commit 07daa7f
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 63 deletions.
diff --git a/appliances/jboss-jgroups-appliance/jboss-jgroups-appliance.appl b/appliances/jboss-jgroups-appliance/jboss-jgroups-appliance.appl
@@ -5,11 +5,5 @@ packages:
   - jboss-jgroups
   - java-1.6.0-openjdk
 
-users:
-  - name:       jgroups
-    group:      jgroups
-    home:       /opt/jboss-jgroups
-    comment:    JBoss JGroups
-
 post:
   - "/sbin/chkconfig --level 234 jgroups-gossip on"
diff --git a/appliances/management-appliance/management-appliance.appl b/appliances/management-appliance/management-appliance.appl
@@ -1,11 +1,5 @@
 
-summary: JBoss Cloud management appliance
-
-users:
-  - name:       jopr
-    group:      jopr
-    home:       /opt/jopr
-    comment:    JBoss JGroups
+summary: JBoss Cloud management and monitoring appliance
 
 packages:
   - dhcp

diff --git a/lib/jboss-appliance-support b/lib/jboss-appliance-support
diff --git a/specs/jboss-as5-cloud-mod_cluster.spec b/specs/jboss-as5-cloud-mod_cluster.spec
@@ -1,15 +1,15 @@
-Summary: JBoss mod_cluster for JBoss AS5 cloud profiles
-Name: jboss-as5-cloud-mod_cluster
-Version: 1.0.1.GA
-Release: 1
-License: LGPL
-BuildArch: noarch
-Group: Applications/System
-Requires: jboss-as5-cloud-profiles
-Requires: patch
-Source0: http://labs.jboss.com/file-access/default/members/mod_cluster/freezone/dist/%{version}/mod-cluster-%{version}-bin.tar.gz
-Source1: jboss-as-5.1.0.GA-mod_cluster.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    JBoss mod_cluster for JBoss AS5 cloud profiles
+Name:       jboss-as5-cloud-mod_cluster
+Version:    1.0.1.GA
+Release:    1
+License:    LGPL
+BuildArch:  noarch
+Group:      Applications/System
+Requires:   jboss-as5-cloud-profiles
+Requires:   patch
+Source0:    http://labs.jboss.com/file-access/default/members/mod_cluster/freezone/dist/%{version}/mod-cluster-%{version}-bin.tar.gz
+Source1:    jboss-as-5.1.0.GA-mod_cluster.patch
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define __jar_repack %{nil}
 

diff --git a/specs/jboss-as5-cloud-profiles.spec b/specs/jboss-as5-cloud-profiles.spec
@@ -1,4 +1,4 @@
-%define jgroups_version 2.6.12.Beta2
+%define jgroups_version 2.6.12.GA
 %define jboss_version 5.1.0.GA
 
 Summary:        JBoss Cloud profiles
@@ -10,7 +10,7 @@ BuildArch:      noarch
 Group:          Applications/System
 Source0:        http://internap.dl.sourceforge.net/sourceforge/jboss/jboss-%{jboss_version}-jdk6.zip
 Source1:        jboss-as5-5.1.0.GA-cloud-gossip.patch
-Source2:        http://repo.oddthesis.org/bundles/JGroups-%{jgroups_version}.bin.tar.gz
+Source2:        http://heanet.dl.sourceforge.net/sourceforge/javagroups/JGroups-%{jgroups_version}.bin.zip
 Requires:       jboss-as5
 BuildRequires:  patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

diff --git a/specs/jboss-cloud-environment.spec b/specs/jboss-cloud-environment.spec
@@ -2,7 +2,7 @@
 
 Summary:        JBoss Cloud environment
 Name:           jboss-cloud-environment
-Version:        1.0.0.Beta6
+Version:        1.0.0.Beta7
 Release:        1
 License:        LGPL
 BuildArch:      noarch

diff --git a/specs/jboss-cloud-management.spec b/specs/jboss-cloud-management.spec
@@ -1,6 +1,6 @@
 Summary:        JBoss Cloud management support for appliances
 Name:           jboss-cloud-management
-Version:        1.0.0.Beta6
+Version:        1.0.0.Beta7
 Release:        1
 License:        LGPL
 Requires:       git

diff --git a/specs/jboss-jgroups.spec b/specs/jboss-jgroups.spec
@@ -1,14 +1,14 @@
-Summary: JBoss JGroups
-Name: jboss-jgroups
-Version: 2.6.12.GA
-Release: 1
-License: LGPL
-BuildArch: noarch
-Group: Applications/System
-Requires: shadow-utils
-Source0: http://heanet.dl.sourceforge.net/sourceforge/javagroups/JGroups-%{version}.bin.zip
-Source1: jgroups-gossip.init
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Summary:    JBoss JGroups
+Name:       jboss-jgroups
+Version:    2.6.12.GA
+Release:    1
+License:    LGPL
+BuildArch:  noarch
+Group:      Applications/System
+Requires:   shadow-utils
+Source0:    http://heanet.dl.sourceforge.net/sourceforge/javagroups/JGroups-%{version}.bin.zip
+Source1:    jgroups-gossip.init
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define __jar_repack %{nil}
 

diff --git a/specs/jopr.spec b/specs/jopr.spec
@@ -44,7 +44,7 @@ rm -Rf $RPM_BUILD_ROOT
 
 %pre
 /usr/sbin/groupadd -r jopr 2>/dev/null || :
-/usr/sbin/useradd -c "JBoss JOPR" -r -s /bin/bash -d /opt/jboss-jopr -g jopr jopr 2>/dev/null || :
+/usr/sbin/useradd -c "JOPR" -r -s /bin/bash -d /opt/jboss-jopr -g jopr jopr 2>/dev/null || :
 
 %files
 %defattr(-,jopr,jopr)

diff --git a/specs/mod_cluster.spec b/specs/mod_cluster.spec
@@ -4,17 +4,17 @@
 	%define mod_cluster_arch 64
 %endif
 
-Summary: JBoss mod_cluster for Apache httpd
-Name: mod_cluster
-Version: 1.0.1.GA
-Release: 1
-License: LGPL
-BuildRoot: %{_tmppath}/%{name}-buildroot
-Group: Applications/System
-Requires: httpd-devel >= 2.2.8
-Source0: http://www.jboss.org/file-access/default/members/mod_cluster/freezone/dist/%{version}/mod_cluster-%{version}-linux2-x86-so.tar.gz
-Source1: http://www.jboss.org/file-access/default/members/mod_cluster/freezone/dist/%{version}/mod_cluster-%{version}-linux2-x64-so.tar.gz
-Source2: mod_cluster.conf
+Summary:    JBoss mod_cluster for Apache httpd
+Name:       mod_cluster
+Version:    1.0.1.GA
+Release:    1
+License:    LGPL
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:      Applications/System
+Requires:   httpd-devel >= 2.2.8
+Source0:    http://www.jboss.org/file-access/default/members/mod_cluster/freezone/dist/%{version}/mod_cluster-%{version}-linux2-x86-so.tar.gz
+Source1:    http://www.jboss.org/file-access/default/members/mod_cluster/freezone/dist/%{version}/mod_cluster-%{version}-linux2-x64-so.tar.gz
+Source2:    mod_cluster.conf
 
 %description
 JBoss mod_cluster for Apache httpd

diff --git a/specs/torquebox.spec b/specs/torquebox.spec
@@ -1,13 +1,13 @@
-Summary: TorqueBox
-Name: torquebox
-Version: 1.0.0.Beta13
-Release: 1
-License: LGPL
-BuildArch: noarch
-Group: Applications/System
-Source0: http://repository.torquebox.org/maven2/releases/org/torquebox/torquebox-core/%{version}/torquebox-core-%{version}-deployer.jar 
-Requires: jboss-as5
-BuildRoot: /tmp/%{name}
+Summary:    TorqueBox
+Name:       torquebox
+Version:    1.0.0.Beta13
+Release:    1
+License:    LGPL
+BuildArch:  noarch
+Group:      Applications/System
+Source0:    http://repository.torquebox.org/maven2/releases/org/torquebox/torquebox-core/%{version}/torquebox-core-%{version}-deployer.jar
+Requires:   jboss-as5
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define __jar_repack %{nil}
 

diff --git a/src/jopr-agent.init b/src/jopr-agent.init
@@ -34,6 +34,8 @@ if [ "x$JOPR_SERVER_IP" = "x" ]; then
         exit 0
 fi
 
+[ ! -d $RHQ_AGENT_HOME ] && /usr/share/jopr-agent/jopr-agent-install.sh
+
 # ----------------------------------------------------------------------
 # Function that simply dumps a message iff debug mode is enabled
 # ----------------------------------------------------------------------

diff --git a/src/mod_cluster.conf b/src/mod_cluster.conf
@@ -11,3 +11,5 @@ LoadModule advertise_module     modules/mod_advertise.so
 <Location /mod_cluster_manager>
     SetHandler mod_cluster-manager
 </Location>
+
+Maxsessionid 50