backend/common/rhnConfig.py
| 9 +--
backend/common/spacewalk-cfg-get.sgml
| 12 ++--
backend/rhn-conf/Makefile
| 2
backend/spacewalk-backend.spec
| 27 +++++-----
branding/spacewalk-branding.spec
| 6 +-
client/tools/osad/osad.spec
| 4 -
client/tools/osad/rhn-conf/Makefile
| 2
java/build.xml
| 2
java/buildconf/build-webapp.xml
| 8 +-
java/code/src/com/redhat/rhn/common/conf/Config.java
| 11 ++--
java/scripts/taskomatic
| 2
java/spacewalk-java.spec
| 14 ++---
proxy/proxy/pm/rhn-conf/Makefile
| 3 -
proxy/proxy/rhn-conf/Makefile
| 5 +
proxy/proxy/spacewalk-proxy.spec
| 15 +----
search-server/spacewalk-search/src/java/com/redhat/satellite/search/config/Configuration.java
| 2
spacewalk/config/usr/share/man/man5/rhn.conf.5
| 2
web/modules/pxt/PXT/Config.pm
| 2
web/spacewalk-web.spec
| 10 +--
19 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit 2bf3877ff0e25c5b563114cc0dc27800fdf764b4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 10:01:10 2011 +0200
621531 - update web Config to use the new /usr/share/rhn/config-defaults location.
diff --git a/web/modules/pxt/PXT/Config.pm b/web/modules/pxt/PXT/Config.pm
index ec573ef..960585c 100644
--- a/web/modules/pxt/PXT/Config.pm
+++ b/web/modules/pxt/PXT/Config.pm
@@ -216,7 +216,7 @@ sub reset_default {
sub master_configs {
my $self = shift;
- return "/etc/rhn/default/rhn_$self->{domain}.conf";
+ return "/usr/share/rhn/config-defaults/rhn_$self->{domain}.conf";
}
sub local_configs {
commit b7e1c168f2315066d1c5f21a560b3423d3358cfa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 09:56:58 2011 +0200
621531 - fixing rhn.conf(5) man page.
diff --git a/spacewalk/config/usr/share/man/man5/rhn.conf.5
b/spacewalk/config/usr/share/man/man5/rhn.conf.5
index 296cc75..f26b2d2 100644
--- a/spacewalk/config/usr/share/man/man5/rhn.conf.5
+++ b/spacewalk/config/usr/share/man/man5/rhn.conf.5
@@ -19,7 +19,7 @@ Format of /etc/rhn/rhn.conf is very simple. Each line is either a
comment or a d
parameter = value
.SH OPTIONS
.P
-Spacewalk/RHN Satellite includes dozens other options in \fB/etc/rhn/default/*.conf\fR
which administrator can override,
+Spacewalk/RHN Satellite includes dozens other options in
\fB/usr/share/rhn/config-defaults/*.conf\fR which administrator can override in
/etc/rhn/rhn.conf,
but \fB*** JUST CHANGE THOSE PARAMETERS IF YOU REALLY KNOW WHAT ARE YOU DOING! *** \fR
.P
commit 628e6e829b0112b05ddbb94f889a8f12488fa27b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 09:54:47 2011 +0200
621531 - fixing comment - the search server uses /etc/rhn/search, not
/etc/rhn/default.
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 be13fd3..504218c 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,7 +41,7 @@ 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/default/rhn.conf setting defaults
+ * Config files are properties, with /etc/rhn/search/rhn.conf setting defaults
* that can be overridden /etc/rhn/rhn.conf.
*
* @version $Rev$
commit 44fea14a99d0a85c55aff76e49bac128b97cfba2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 09:48:23 2011 +0200
621531 - update java build configs to use the new /usr/share/rhn/config-defaults
location.
diff --git a/java/build.xml b/java/build.xml
index e421178..614bf79 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -596,7 +596,7 @@
<target name="cleanup-tests">
<property file="${rhn.config.dir}/rhn.conf"
prefix="rhn.db"/>
- <property file="${rhn.config.dir}/default/rhn_hibernate.conf"
prefix="rhn.db"/>
+ <property file="/usr/share/rhn/config-defaults/rhn_hibernate.conf"
prefix="rhn.db"/>
<sql
driver="${rhn.db.hibernate.connection.driver_class}"
url="${rhn.db.hibernate.connection.url}"
diff --git a/java/buildconf/build-webapp.xml b/java/buildconf/build-webapp.xml
index 6fa3d4c..2bcc983 100644
--- a/java/buildconf/build-webapp.xml
+++ b/java/buildconf/build-webapp.xml
@@ -137,9 +137,9 @@
<target name="install-taskomatic"
description="Used to run taskomatic on your local workstation">
<echo message="NOTE: This task should be run as root since it modifies /etc
and /usr/bin" />
- <symlink link="/etc/rhn/default/rhn_taskomatic_daemon.conf"
+ <symlink
link="/usr/share/rhn/config-defaults/rhn_taskomatic_daemon.conf"
resource="${rhn-home}/conf/default/rhn_taskomatic_daemon.conf"
/>
- <symlink link="/etc/rhn/default/rhn_org_quartz.conf"
+ <symlink link="/usr/share/rhn/config-defaults/rhn_org_quartz.conf"
resource="${rhn-home}/conf/default/rhn_org_quartz.conf" />
<symlink link="/etc/init.d/taskomatic"
resource="${rhn-home}/scripts/taskomatic" />
@@ -153,8 +153,8 @@
description="Used to uninstall taskomatic from your local
workstation">
<echo message="NOTE: This task should be run as root since it modifies /etc
and /usr/bin" />
<echo message="This target should be run as root since it modifies /etc and
/usr/bin" />
- <delete file="/etc/rhn/default/rhn_taskomatic_daemon.conf" />
- <delete file="/etc/rhn/default/rhn_org_quartz.conf" />
+ <delete file="/usr/share/rhn/config-defaults/rhn_taskomatic_daemon.conf"
/>
+ <delete file="/usr/share/rhn/config-defaults/rhn_org_quartz.conf" />
<delete file="/etc/init.d/taskomatic" />
<delete file="/usr/bin/taskomaticd" />
</target>
commit e754176b274ae5e84a94b6153976ad7907970375
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 09:48:06 2011 +0200
621531 - update java Config and taskomatic to use the new
/usr/share/rhn/config-defaults location.
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java
b/java/code/src/com/redhat/rhn/common/conf/Config.java
index 91893178..86c66ce 100644
--- a/java/code/src/com/redhat/rhn/common/conf/Config.java
+++ b/java/code/src/com/redhat/rhn/common/conf/Config.java
@@ -35,8 +35,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/default/rhn.conf setting defaults
- * that can be overridden /etc/rhn/rhn.conf.
+ * Config files are properties, with /usr/share/rhn/config-defaults/rhn.conf
+ * setting defaults that can be overridden by /etc/rhn/rhn.conf.
*
* @version $Rev$
*/
@@ -57,6 +57,11 @@ public class Config {
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 configuration directory.
* If the property is not set, config files are read
* from {@link #DEFAULT_CONF_DIR}
@@ -110,7 +115,7 @@ public class Config {
* those
*/
public Config() throws ConfigException {
- addPath(getDefaultConfigDir() + "/default");
+ addPath(DEFAULT_DEFAULT_CONF_DIR);
addPath(getDefaultConfigFilePath());
parseFiles();
}
diff --git a/java/scripts/taskomatic b/java/scripts/taskomatic
index 0c02511..c18be2b 100755
--- a/java/scripts/taskomatic
+++ b/java/scripts/taskomatic
@@ -34,7 +34,7 @@ APP_LONG_NAME="RHN Taskomatic"
# Wrapper
WRAPPER_CMD="/usr/bin/taskomaticd"
-WRAPPER_CONF="/etc/rhn/default/rhn_taskomatic_daemon.conf"
+WRAPPER_CONF="/usr/share/rhn/config-defaults/rhn_taskomatic_daemon.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified.
commit 40dc47cdc62c4884b4cdae1729fb1962ead5032b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 09:34:06 2011 +0200
621531 - update the path in the man page, plus some polishing.
diff --git a/backend/common/spacewalk-cfg-get.sgml
b/backend/common/spacewalk-cfg-get.sgml
index 28c8bd2..438afda 100644
--- a/backend/common/spacewalk-cfg-get.sgml
+++ b/backend/common/spacewalk-cfg-get.sgml
@@ -8,7 +8,7 @@
<RefMeta>
<RefEntryTitle>&SCRIPTCOMMAND;</RefEntryTitle><manvolnum>8</manvolnum>
-<RefMiscInfo>Version 0.6</RefMiscInfo>
+<RefMiscInfo>Version 1.6</RefMiscInfo>
</RefMeta>
<RefNameDiv>
@@ -21,7 +21,7 @@ Read values from &SERVER; configuration files.
<RefSynopsisDiv>
<Synopsis>
<cmdsynopsis>
- <command>&SCRIPTCOMMAND; get
<replaceable>component</replaceable>
<replaceable>key</replaceable></command>
+ <command>&SCRIPTCOMMAND; get
<replaceable>component</replaceable>
<replaceable>key</replaceable></command>
</cmdsynopsis>
<cmdsynopsis>
<command>&SCRIPTCOMMAND; list
<replaceable>component</replaceable></command>
@@ -35,12 +35,12 @@ Read values from &SERVER; configuration files.
<RefSect1><Title>Description</Title>
<para>
-This script parse configuration files of &SERVER; including /etc/rhn/rhn.conf and
/etc/rhn/default/* and write list of
-one componenet or write value of some key.
+This script parses configuration files of &SERVER; including /etc/rhn/rhn.conf and
/usr/share/rhn/config-defaults/* and outputs list of
+values for specified component, or outputs value of specified key.
</para>
<para>
Executing &SCRIPTCOMMAND; with only one parameter (e.g. &SCRIPTCOMMAND; key) is
equivalent of &SCRIPTCOMMAND; get '' key
-</para>
+</para>
</RefSect1>
<RefSect1><Title>Options</Title>
@@ -63,7 +63,7 @@ Executing &SCRIPTCOMMAND; with only one parameter (e.g.
&SCRIPTCOMMAND; key) is
<RefSect1><Title>Authors</Title>
<simplelist>
<member>Miroslav Suchý
<email>msuchy(a)redhat.com</email></member>
- <member>Jan Pazdziora Ph.D. </member>
+ <member>Jan Pazdziora</member>
</simplelist>
</RefSect1>
</RefEntry>
commit 83cf859b7e57073b7cad2684a91331236ace4ce8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 30 09:33:40 2011 +0200
621531 - update backend rhnConfig to use the new /usr/share/rhn/config-defaults
location.
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index a8387a8..2f05168 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -23,6 +23,7 @@ from rhn.UserDictCase import UserDictCase
_CONFIG_ROOT = '/etc/rhn'
_CONFIG_FILE = '%s/rhn.conf' % _CONFIG_ROOT
+_CONFIG_DEFAULTS_ROOT = '/usr/share/rhn/config-defaults'
def warn(*args):
@@ -140,7 +141,7 @@ class RHNOptions:
self.__merge()
def _parseDefaults(self, allCompsYN=0):
- """ Parsing of the /etc/rhn/default/*.conf (or equivalent)
+ """ Parsing of the /usr/share/rhn/config-defaults/*.conf (or
equivalent)
Make sure we have all the needed default config files loaded
We store the defaults in a dictionary, keyed on the component tuple
"""
@@ -153,9 +154,9 @@ class RHNOptions:
# XXX: Should we do timestamp checking for this one too?
continue
# Create the config file name
- conffile = "%s/default/rhn.conf" % (self.root)
+ conffile = "%s/rhn.conf" % (_CONFIG_DEFAULTS_ROOT)
if comp:
- conffile = "%s/default/rhn_%s.conf" % (self.root,
+ conffile = "%s/rhn_%s.conf" % (_CONFIG_DEFAULTS_ROOT,
'_'.join(comp))
# if the file is not there (or can't be read), skip
if not os.access(conffile, os.R_OK):
@@ -629,7 +630,7 @@ def getAllComponents_tree(defaultDir=None):
"""
if defaultDir is None:
- defaultDir = _CONFIG_ROOT+'/default'
+ defaultDir = _CONFIG_DEFAULTS_ROOT
comps = glob.glob('%s/*.conf' % defaultDir)
compTree = {}
for comp in comps:
commit a869e20b45bedbdd8cb345dd68c2d6f900282f7d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 23 14:40:03 2011 +0200
621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (proxy).
diff --git a/proxy/proxy/pm/rhn-conf/Makefile b/proxy/proxy/pm/rhn-conf/Makefile
index 3979236..3b8d6ca 100644
--- a/proxy/proxy/pm/rhn-conf/Makefile
+++ b/proxy/proxy/pm/rhn-conf/Makefile
@@ -6,9 +6,8 @@
TOP = ../..
INSTALL_FILES = $(wildcard *.conf)
-INSTALL_DEST = /etc/rhn/default
+INSTALL_DEST = /usr/share/rhn/config-defaults
include $(TOP)/Makefile.defs
install :: $(PREFIX)$(INSTALL_DEST)
- touch $(PREFIX)$(INSTALL_DEST)/../rhn.conf
diff --git a/proxy/proxy/rhn-conf/Makefile b/proxy/proxy/rhn-conf/Makefile
index 3222c8b..be4ca56 100644
--- a/proxy/proxy/rhn-conf/Makefile
+++ b/proxy/proxy/rhn-conf/Makefile
@@ -6,9 +6,10 @@
TOP = ..
INSTALL_FILES = $(wildcard *.conf)
-INSTALL_DEST = /etc/rhn/default
+INSTALL_DEST = /usr/share/rhn/config-defaults
include $(TOP)/Makefile.defs
install :: $(PREFIX)$(INSTALL_DEST)
- touch $(PREFIX)$(INSTALL_DEST)/../rhn.conf
+ mkdir -p $(PREFIX)/etc/rhn
+ touch $(PREFIX)/etc/rhn/rhn.conf
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index ad3afb4..9762988 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -254,9 +254,7 @@ fi
%attr(770,root,apache) %dir %{_var}/log/rhn
%config(noreplace) %{_sysconfdir}/logrotate.d/rhn-proxy-broker
# config files
-%attr(755,root,apache) %dir %{rhnconf}
-%attr(755,root,apache) %dir %{rhnconf}/default
-%attr(644,root,apache) %{rhnconf}/default/rhn_proxy_broker.conf
+%attr(644,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_proxy_broker.conf
%files redirect
%defattr(-,root,root)
@@ -266,9 +264,7 @@ fi
%attr(775,root,apache) %dir %{_var}/log/rhn
%config(noreplace) %{_sysconfdir}/logrotate.d/rhn-proxy-redirect
# config files
-%attr(755,root,apache) %dir %{rhnconf}
-%attr(755,root,apache) %dir %{rhnconf}/default
-%attr(644,root,apache) %{rhnconf}/default/rhn_proxy_redirect.conf
+%attr(644,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_proxy_redirect.conf
%files common
%defattr(-,root,root)
@@ -288,8 +284,7 @@ fi
# config files
%attr(755,root,apache) %dir %{rhnconf}
%attr(645,root,apache) %config %{rhnconf}/rhn.conf
-%attr(754,root,apache) %dir %{rhnconf}/default
-%attr(644,root,apache) %{rhnconf}/default/rhn_proxy.conf
+%attr(644,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_proxy.conf
%attr(644,root,apache) %config %{httpdconf}/spacewalk-proxy.conf
# this file is created by either cli or webui installer
%ghost %config %{httpdconf}/cobbler-proxy.conf
@@ -307,9 +302,7 @@ fi
%files package-manager
%defattr(-,root,root)
# config files
-%attr(755,root,apache) %dir %{rhnconf}
-%attr(755,root,apache) %dir %{rhnconf}/default
-%attr(644,root,apache) %config %{rhnconf}/default/rhn_proxy_package_manager.conf
+%attr(644,root,apache)
%{_prefix}/share/rhn/config-defaults/rhn_proxy_package_manager.conf
%{_bindir}/rhn_package_manager
%{rhnroot}/PackageManager/rhn_package_manager.py*
%{rhnroot}/PackageManager/uploadLib.py*
commit 457b5a6ebcee65be702b2c9b32f6debedfe1a15f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 23 14:27:51 2011 +0200
621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (osa-dispatcher).
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index d665c35..f63a9b1 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -246,7 +246,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%{rhnroot}/osad/rhn_log.py*
%config(noreplace) %{_sysconfdir}/sysconfig/osa-dispatcher
%config(noreplace) %{_sysconfdir}/logrotate.d/osa-dispatcher
-%config %{_sysconfdir}/rhn/default/rhn_osa-dispatcher.conf
+%{rhnroot}/config-defaults/rhn_osa-dispatcher.conf
%config %{_sysconfdir}/rhn/tns_admin/osa-dispatcher
%config(noreplace) %{_sysconfdir}/rhn/tns_admin/osa-dispatcher/sqlnet.ora
%attr(755,root,root) %{_initrddir}/osa-dispatcher
@@ -256,7 +256,7 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%doc PYTHON-LICENSES.txt
%if 0%{?suse_version}
%dir %{_sysconfdir}/rhn
-%dir %{_sysconfdir}/rhn/default
+%dir %{rhnroot}/config-defaults
%dir %{_sysconfdir}/rhn/tns_admin
%dir %{_var}/log/rhn
%endif
diff --git a/client/tools/osad/rhn-conf/Makefile b/client/tools/osad/rhn-conf/Makefile
index 09145cc..6fea6b2 100644
--- a/client/tools/osad/rhn-conf/Makefile
+++ b/client/tools/osad/rhn-conf/Makefile
@@ -6,6 +6,6 @@
TOP = ..
INSTALL_FILES = $(wildcard *.conf)
-INSTALL_DEST = /etc/rhn/default
+INSTALL_DEST = /usr/share/rhn/config-defaults
include $(TOP)/Makefile.defs
commit fc27f4eb60c5bf6ba155403ccbbd196a8d61781a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 23 14:34:27 2011 +0200
621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (branding).
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 6a34d2e..1aefa46 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -39,7 +39,7 @@ install -d -m 755
%{buildroot}%{_var}/lib/tomcat5/webapps/rhn/WEB-INF/lib/
install -d -m 755 %{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/
%endif
install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn
-install -d -m 755 %{buildroot}/%{_sysconfdir}/rhn/default
+install -d -m 755 %{buildroot}/%{_prefix}/share/rhn/config-defaults
cp -pR css %{buildroot}/%{_var}/www/html/
cp -pR img %{buildroot}/%{_var}/www/html/
# Appplication expects two favicon's for some reason, copy it so there's just
@@ -54,7 +54,7 @@ ln -s %{_datadir}/rhn/lib/java-branding.jar
%{buildroot}%{_var}/lib/tomcat5/weba
%else
ln -s %{_datadir}/rhn/lib/java-branding.jar
%{buildroot}%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
%endif
-cp -p conf/rhn_docs.conf %{buildroot}/%{_sysconfdir}/rhn/default/rhn_docs.conf
+cp -p conf/rhn_docs.conf %{buildroot}/%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
%clean
rm -rf %{buildroot}
@@ -79,7 +79,7 @@ rm -rf %{buildroot}
%else
%{_var}/lib/tomcat6/webapps/rhn/WEB-INF/lib/java-branding.jar
%endif
-%{_sysconfdir}/rhn/default/rhn_docs.conf
+%{_prefix}/share/rhn/config-defaults/rhn_docs.conf
%doc LICENSE
%changelog
commit 03ae35dcd3a0c3719e008210ec40fa74fc825a69
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 23 14:33:25 2011 +0200
621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (web).
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index f504a4e..f15c32a 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -130,13 +130,13 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} \;
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
mkdir -p $RPM_BUILD_ROOT/%{_var}/www/html/pub
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/init.d
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily
-install -m 644 conf/rhn_web.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default
-install -m 644 conf/rhn_dobby.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default
+install -m 644 conf/rhn_web.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
+install -m 644 conf/rhn_dobby.conf $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -m 755 modules/dobby/scripts/check-oracle-space-usage.sh
$RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/check-oracle-space-usage.sh
@@ -225,14 +225,14 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/Exception.pm
%{perl_vendorlib}/RHN/DB.pm
%{perl_vendorlib}/PXT/Config.pm
-%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_web.conf
+%attr(640,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_web.conf
%doc LICENSE
%files -n spacewalk-dobby
%attr(755,root,root) %{_bindir}/db-control
%{_mandir}/man1/db-control.1.gz
%{perl_vendorlib}/Dobby.pm
-%attr(640,root,apache) %config %{_sysconfdir}/rhn/default/rhn_dobby.conf
+%attr(640,root,apache) %{_prefix}/share/rhn/config-defaults/rhn_dobby.conf
%attr(0755,root,root) %{_sysconfdir}/cron.daily/check-oracle-space-usage.sh
%{perl_vendorlib}/Dobby/
commit e379f599a9ad72f09980aae9e9a5e32f41776317
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 23 14:31:29 2011 +0200
621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (java).
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 10f5d00..90ef747 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -333,10 +333,10 @@ install -m 755 conf/rhn6.xml
$RPM_BUILD_ROOT%{_sysconfdir}/tomcat6/Catalina/loca
install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rhn
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rhn/default
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/lib
install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/classes
+install -d -m 755 $RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults
install -d -m 755 $RPM_BUILD_ROOT%{cobprofdir}
install -d -m 755 $RPM_BUILD_ROOT%{cobprofdirup}
install -d -m 755 $RPM_BUILD_ROOT%{cobprofdirwiz}
@@ -344,9 +344,9 @@ install -d -m 755 $RPM_BUILD_ROOT%{cobdirsnippets}
install -d -m 755 $RPM_BUILD_ROOT%{_var}/spacewalk/systemlogs
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -m 644 conf/default/rhn_hibernate.conf
$RPM_BUILD_ROOT%{_sysconfdir}/rhn/default/rhn_hibernate.conf
-install -m 644 conf/default/rhn_taskomatic_daemon.conf
$RPM_BUILD_ROOT%{_sysconfdir}/rhn/default/rhn_taskomatic_daemon.conf
-install -m 644 conf/default/rhn_org_quartz.conf
$RPM_BUILD_ROOT%{_sysconfdir}/rhn/default/rhn_org_quartz.conf
+install -m 644 conf/default/rhn_hibernate.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_hibernate.conf
+install -m 644 conf/default/rhn_taskomatic_daemon.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_taskomatic_daemon.conf
+install -m 644 conf/default/rhn_org_quartz.conf
$RPM_BUILD_ROOT%{_prefix}/share/rhn/config-defaults/rhn_org_quartz.conf
install -m 755 conf/logrotate/rhn_web_api
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/rhn_web_api
install -m 755 scripts/taskomatic $RPM_BUILD_ROOT%{_initrddir}
install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar
$RPM_BUILD_ROOT%{_datadir}/rhn/lib
@@ -537,9 +537,9 @@ fi
%files config
%defattr(644, root, root)
-%config %{_sysconfdir}/rhn/default/rhn_hibernate.conf
-%config %{_sysconfdir}/rhn/default/rhn_taskomatic_daemon.conf
-%config %{_sysconfdir}/rhn/default/rhn_org_quartz.conf
+%{_prefix}/share/rhn/config-defaults/rhn_hibernate.conf
+%{_prefix}/share/rhn/config-defaults/rhn_taskomatic_daemon.conf
+%{_prefix}/share/rhn/config-defaults/rhn_org_quartz.conf
%config %{_sysconfdir}/logrotate.d/rhn_web_api
commit c1a482ead91e3a7b735d7265d244aedd7d6f3897
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Sep 23 14:24:04 2011 +0200
621531 - move /etc/rhn/default to /usr/share/rhn/config-defaults (backend).
diff --git a/backend/rhn-conf/Makefile b/backend/rhn-conf/Makefile
index 4ed6fcf..6949c3c 100644
--- a/backend/rhn-conf/Makefile
+++ b/backend/rhn-conf/Makefile
@@ -6,7 +6,7 @@
TOP = ..
INSTALL_FILES = $(wildcard *.conf)
-INSTALL_DEST = /etc/rhn/default
+INSTALL_DEST = /usr/share/rhn/config-defaults
include $(TOP)/Makefile.defs
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 36dac85..aba2bb2 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -1,4 +1,5 @@
%global rhnroot %{_prefix}/share/rhn
+%global rhnconfigdefaults %{rhnroot}/config-defaults
%global rhnconf %{_sysconfdir}/rhn
%global httpdconf %{rhnconf}/satellite-httpd/conf
%global apacheconfd %{_sysconfdir}/httpd/conf.d
@@ -350,8 +351,8 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/common/RPC_Base.py*
%attr(770,root,apache) %dir %{_var}/log/rhn
# config files
-%attr(755,root,apache) %dir %{rhnconf}/default
-%attr(644,root,apache) %{rhnconf}/default/rhn.conf
+%attr(755,root,apache) %dir %{rhnconfigdefaults}
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn.conf
%attr(755,root,root) %{_bindir}/spacewalk-cfg-get
%{_mandir}/man8/spacewalk-cfg-get.8.gz
# wsgi stuff
@@ -445,7 +446,7 @@ rm -f %{rhnconf}/rhnSecret.py*
# the cache
%attr(755,apache,apache) %dir %{_var}/cache/rhn
# config files
-%attr(644,root,apache) %{rhnconf}/default/rhn_server.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server.conf
# main httpd config
%attr(644,root,apache) %config %{apacheconfd}/zz-spacewalk-server.conf
@@ -478,7 +479,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{pythonrhnroot}/server/action_extra_data
%{pythonrhnroot}/server/action_extra_data/*
# config files
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_xmlrpc.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_xmlrpc.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xmlrpc.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-xmlrpc
@@ -488,7 +489,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/applet
%{rhnroot}/server/handlers/applet/*
# config files
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_applet.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_applet.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-applet.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-applet
@@ -498,7 +499,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/app
%{rhnroot}/server/handlers/app/*
# config files
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_app.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_app.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-app.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-app
@@ -508,7 +509,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/server/handlers/xp
%{rhnroot}/server/handlers/xp/*
# config files
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_xp.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_xp.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-xp.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-xp
@@ -562,7 +563,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config
%{rhnroot}/server/handlers/config/*
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management.conf
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-config-management.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files
@@ -571,7 +572,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%doc PYTHON-LICENSES.txt LICENSE
%dir %{rhnroot}/server/handlers/config_mgmt
%{rhnroot}/server/handlers/config_mgmt/*
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_config-management-tool.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_config-management-tool.conf
%attr(644,root,apache) %config
%{httpdconf}/rhn/spacewalk-backend-config-management-tool.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-config-files-tool
@@ -583,15 +584,15 @@ rm -f %{rhnconf}/rhnSecret.py*
%dir %{rhnroot}/upload_server/handlers
%{rhnroot}/upload_server/handlers/__init__.py*
%{rhnroot}/upload_server/handlers/package_push
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload.conf
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_upload_package-push.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_upload.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_upload_package-push.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-package-push-server
%attr(644,root,apache) %config %{httpdconf}/rhn/spacewalk-backend-package-push.conf
%files tools
%defattr(-,root,root)
%doc PYTHON-LICENSES.txt LICENSE
-%attr(644,root,apache) %{rhnconf}/default/rhn_server_satellite.conf
+%attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_satellite.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/spacewalk-backend-tools
%attr(755,root,root) %{_bindir}/rhn-charsets
%attr(755,root,root) %{_bindir}/rhn-satellite-activate
@@ -637,7 +638,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%attr(755,root,apache) %dir %{_var}/log/rhn/reposync
%{pythonrhnroot}/satellite_tools/repo_plugins/__init__.py*
%{pythonrhnroot}/satellite_tools/repo_plugins/yum_src.py*
-%config %attr(644,root,apache) %{rhnconf}/default/rhn_server_iss.conf
+%config %attr(644,root,apache) %{rhnconfigdefaults}/rhn_server_iss.conf
%{_mandir}/man8/rhn-satellite-exporter.8*
%{_mandir}/man8/rhn-charsets.8*
%{_mandir}/man8/rhn-satellite-activate.8*