rel-eng/packages/spacewalk-search
| 2 -
search-server/spacewalk-search/run.sh
| 4 +-
search-server/spacewalk-search/spacewalk-search.spec
| 20 ++++++----
search-server/spacewalk-search/src/config/rhn-search
| 4 +-
search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
| 13 ++++--
5 files changed, 27 insertions(+), 16 deletions(-)
New commits:
commit f5311102a08746339eff9eab0d012c2c3bab4c69
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:49:24 2011 +0200
Automatic commit of package [spacewalk-search] release [1.6.3-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 71d5bf1..2766fe0 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.6.2-1 search-server/spacewalk-search/
+1.6.3-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec
b/search-server/spacewalk-search/spacewalk-search.spec
index c37984e..aa58a35 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -116,6 +116,13 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Fri Sep 30 2011 Jan Pazdziora 1.6.3-1
+- 621531 - update startup scripts to use the new /usr/share/rhn/config-defaults
+ location.
+- 621531 - update search Configuration to use the new /usr/share/rhn/config-
+ defaults location.
+- 621531 - move /etc/rhn/search to /usr/share/rhn/config-defaults (search).
+
* Fri Sep 30 2011 Jan Pazdziora 1.6.2-1
- 621531 - fixing comment - the search server uses /etc/rhn/search, not
/etc/rhn/default.
commit de094fb3b04cbffeb3133a6e68ea036a6acf573d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:41:05 2011 +0200
621531 - update startup scripts to use the new /usr/share/rhn/config-defaults
location.
diff --git a/search-server/spacewalk-search/run.sh
b/search-server/spacewalk-search/run.sh
index 0bbf58a..8c6e7d7 100755
--- a/search-server/spacewalk-search/run.sh
+++ b/search-server/spacewalk-search/run.sh
@@ -6,8 +6,8 @@ if [ ! "$RETURN_VAL" -eq "0" ]; then
exit 1;
fi
-if [ ! -r "/etc/rhn/search/rhn_search.conf" ]; then
- echo "you need to symlink rhn_search.conf as
/etc/rhn/search/rhn_search.conf"
+if [ ! -r "/usr/share/rhn/config-defaults/rhn_search.conf" ]; then
+ echo "you need to symlink rhn_search.conf as
/usr/share/rhn/config-defaults/rhn_search.conf"
exit 2;
fi
diff --git a/search-server/spacewalk-search/src/config/rhn-search
b/search-server/spacewalk-search/src/config/rhn-search
index 1429d17..2103c86 100644
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -34,7 +34,7 @@ APP_LONG_NAME="rhn-search"
# Wrapper
WRAPPER_CMD="/usr/bin/rhnsearchd"
-WRAPPER_CONF="/etc/rhn/search/rhn_search_daemon.conf"
+WRAPPER_CONF="/usr/share/rhn/config-defaults/rhn_search_daemon.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified.
@@ -64,7 +64,7 @@ unlock() {
IDXDIR=`grep search.index_work_dir /etc/rhn/rhn.conf`
if [ -z $IDXDIR ]
then
- IDXDIR=`grep search.index_work_dir /etc/rhn/search/rhn_search.conf`
+ IDXDIR=`grep search.index_work_dir
/usr/share/rhn/config-defaults/rhn_search.conf`
fi
if [ ! -z $IDXDIR ]
commit aa562368fb63b7ccf7662792a3f40d18ab0fdd30
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:24:05 2011 +0200
621531 - update search Configuration to use the new /usr/share/rhn/config-defaults
location.
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
index 504218c..67eb2e2 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
@@ -41,8 +41,8 @@ import java.util.TreeSet;
* global config, but you can instantiate one of your own if you want. This
* layer insulates us from changing the underlying implementation.
* <p>
- * Config files are properties, with /etc/rhn/search/rhn.conf setting defaults
- * that can be overridden /etc/rhn/rhn.conf.
+ * Config files are properties, with /usr/share/rhn/config-defaults/*.conf
+ * setting defaults that can be overridden by /etc/rhn/rhn.conf.
*
* @version $Rev$
*/
@@ -60,6 +60,11 @@ public class Configuration {
public static final String DEFAULT_CONF_DIR = "/etc/rhn";
/**
+ * The directory in which to look for default config values
+ */
+ public static final String DEFAULT_DEFAULT_CONF_DIR =
"/usr/share/rhn/config-defaults";
+
+ /**
* The system property containing the RHN configuration directory.
* If the property is not set, config files are read
* from {@link #DEFAULT_CONF_DIR}
@@ -69,7 +74,7 @@ public class Configuration {
/**
* The system property containing the SearchServer configuration directory.
* If the property is not set, config files are read
- * from {@link #DEFAULT_CONF_DIR}/search
+ * from /usr/share/rhn/config-defaults
*/
private static final String SEARCH_CONF_DIR_PROPERTY =
"search.config.dir";
@@ -181,7 +186,7 @@ public class Configuration {
String confDir = System.getProperty(SEARCH_CONF_DIR_PROPERTY);
if (StringUtils.isBlank(confDir)) {
- confDir = getRHNConfigDir() + "/search";
+ confDir = DEFAULT_DEFAULT_CONF_DIR;
}
return confDir;
}
commit 71b5845d7ebe6807b08fefbb63f21ad29861a419
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 11:23:33 2011 +0200
621531 - move /etc/rhn/search to /usr/share/rhn/config-defaults (search).
diff --git a/search-server/spacewalk-search/spacewalk-search.spec
b/search-server/spacewalk-search/spacewalk-search.spec
index 0773781..c37984e 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -72,7 +72,7 @@ Spacewalk Server.
%install
rm -fr ${RPM_BUILD_ROOT}
ant -Djar.version=%{version} install
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rhn/search
+install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/indexes
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib
@@ -87,8 +87,8 @@ cp -d lib/* $RPM_BUILD_ROOT/%{_prefix}/share/rhn/search/lib
install -p -m 644 src/config/etc/logrotate.d/rhn-search
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn-search
install -p -m 755 src/config/rhn-search $RPM_BUILD_ROOT%{_initrddir}
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/rhnsearchd
-install -p -m 644 src/config/search/rhn_search.conf
$RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search.conf
-install -p -m 644 src/config/search/rhn_search_daemon.conf
$RPM_BUILD_ROOT%{_sysconfdir}/rhn/search/rhn_search_daemon.conf
+install -p -m 644 src/config/search/rhn_search.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search.conf
+install -p -m 644 src/config/search/rhn_search_daemon.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
ln -s -f %{_prefix}/share/rhn/search/lib/spacewalk-search-%{version}.jar
$RPM_BUILD_ROOT%{_prefix}/share/rhn/search/lib/spacewalk-search.jar
%clean
@@ -111,9 +111,8 @@ fi
%attr(755, root, root) %{_prefix}/share/rhn/search/indexes
%attr(755, root, root) %{_initrddir}/rhn-search
%attr(755, root, root) %{_bindir}/rhnsearchd
-%dir %{_sysconfdir}/rhn/search/
-%config(noreplace) %{_sysconfdir}/rhn/search/rhn_search.conf
-%config(noreplace) %{_sysconfdir}/rhn/search/rhn_search_daemon.conf
+%{_prefix}/share/rhn/config-defaults/rhn_search.conf
+%{_prefix}/share/rhn/config-defaults/rhn_search_daemon.conf
%{_sysconfdir}/logrotate.d/rhn-search
%changelog