On 04/01/2010 04:12 AM, Jan Pazdziora wrote:
On Wed, Mar 31, 2010 at 04:24:01PM -0400, Joshua Roys wrote:OK- that sounds good. I'll write up a patch tomorrow or Friday to move it over. It will probably be something like /var/spacewalk/systemlogs. Do you have any recommendations on how to handle upgrades? Some options: - just make a release note about it, nothing else - have a %post script move the directory (gross!) - drop a line in rhn.conf pointing the audit code to /var/satellite/systemlogs from a %post - have the code look in both (also gross)My order of rpeference would be 1, 2, 3, 4. ;-)
Jan, How does this patch look? Thanks, Josh
From c76f84a02dc0e9ceed41b6cac432835daf9f279b Mon Sep 17 00:00:00 2001
From: Joshua Roys <joshua.r...@gtri.gatech.edu>
Date: Fri, 2 Apr 2010 16:38:03 -0400
Subject: [PATCH] Move systemlogs directory out of /var/satellite
Now we have our own home in /var/spacewalk.
---
.../com/redhat/rhn/manager/audit/AuditManager.java | 2 +-
java/spacewalk-java.spec | 8 ++++----
selinux/spacewalk-selinux/spacewalk.fc | 2 ++
spacewalk/setup/spacewalk-setup.spec | 4 ++++
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
index 7f7c45d..4bef7e3 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
@@ -49,7 +49,7 @@ public class AuditManager /* extends BaseManager */ {
}
private static String logDirStr =
Config.get().getString("web.audit.logdir",
- "/var/satellite/systemlogs");
+ "/var/spacewalk/systemlogs");
private static File logDir = new File(logDirStr);
private static File reviewFile = new File(logDirStr + "/audit-review.log");
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c74fdfc..e812a17 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -233,7 +233,7 @@ install -d -m 755 $RPM_BUILD_ROOT/%{cobprofdir}
install -d -m 755 $RPM_BUILD_ROOT/%{cobprofdirup}
install -d -m 755 $RPM_BUILD_ROOT/%{cobprofdirwiz}
install -d -m 755 $RPM_BUILD_ROOT/%{cobdirsnippets}
-install -d -m 755 $RPM_BUILD_ROOT/%{_var}/satellite/systemlogs
+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
@@ -248,7 +248,7 @@ ln -s -f /usr/sbin/tanukiwrapper
$RPM_BUILD_ROOT/%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
install -d -m 755 $RPM_BUILD_ROOT/%{realcobsnippetsdir}
ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
-touch $RPM_BUILD_ROOT/%{_var}/satellite/systemlogs/audit-review.log
+touch $RPM_BUILD_ROOT/%{_var}/spacewalk/systemlogs/audit-review.log
%clean
@@ -281,8 +281,8 @@ fi
%config(noreplace) %{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
%{realcobsnippetsdir}/spacewalk
-%attr(755, tomcat, root) %{_var}/satellite/systemlogs
-%ghost %attr(644, tomcat, root) %{_var}/satellite/systemlogs/audit-review.log
+%attr(755, tomcat, root) %{_var}/spacewalk/systemlogs
+%ghost %attr(644, tomcat, root) %{_var}/spacewalk/systemlogs/audit-review.log
%files -n spacewalk-taskomatic
%attr(755, root, root) %{_initrddir}/taskomatic
diff --git a/selinux/spacewalk-selinux/spacewalk.fc
b/selinux/spacewalk-selinux/spacewalk.fc
index 8570ff4..879f0cc 100644
--- a/selinux/spacewalk-selinux/spacewalk.fc
+++ b/selinux/spacewalk-selinux/spacewalk.fc
@@ -11,6 +11,8 @@
/usr/sbin/rhn-sat-restart-silent
gen_context(system_u:object_r:spacewalk_initrc_exec_t,s0)
/var/satellite(/.*)? gen_context(system_u:object_r:spacewalk_data_t,s0)
+/var/spacewalk(/.*)? gen_context(system_u:object_r:spacewalk_data_t,s0)
+
/var/cache/rhn(/.*)? gen_context(system_u:object_r:spacewalk_cache_t,s0)
/var/cache/rhn/satsync(/.*)? gen_context(system_u:object_r:var_t,s0)
diff --git a/spacewalk/setup/spacewalk-setup.spec
b/spacewalk/setup/spacewalk-setup.spec
index 179eaf8..350f2dd 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -75,6 +75,9 @@ install -m 0755 share/oracle/remove-db.sh
%{buildroot}/%{_datadir}/spacewalk/set
install -m 0755 share/oracle/upgrade-db.sh
%{buildroot}/%{_datadir}/spacewalk/setup/oracle
install -m 0755 share/oracle/upgrade-db-10g.sh
%{buildroot}/%{_datadir}/spacewalk/setup/oracle
+# create a directory for misc. Spacewalk things
+install -d -m 755 %{buildroot}/%{_var}/spacewalk
+
%check
make test
@@ -93,6 +96,7 @@ rm -rf %{buildroot}
%{_bindir}/cobbler-setup
%{_mandir}/man[13]/*.[13]*
%{_datadir}/spacewalk/*
+%attr(755, apache, root) %{_var}/spacewalk
%changelog
* Wed Mar 24 2010 Michael Mraka <michael.mr...@redhat.com> 0.9.3-1
--
1.6.6.1
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
