java/spacewalk-java.spec | 2 +-
spacewalk/setup/bin/spacewalk-setup | 6 ------
2 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit b77ae909987391ab6ce1c37bad1e20b2da46edbd
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Mon Mar 29 14:35:20 2010 -0400
Remove audit review cruft from spacewalk-setup
Rely on RPM %files and the O_CREAT behavior of FileWriter to create
our systemlogs directory and audit-review.log file.
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7cc0a09..c74fdfc 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -281,7 +281,7 @@ fi
%config(noreplace) %{_sysconfdir}/tomcat6/Catalina/localhost/rhn.xml
%endif
%{realcobsnippetsdir}/spacewalk
-%attr(755, apache, root) %{_var}/satellite/systemlogs
+%attr(755, tomcat, root) %{_var}/satellite/systemlogs
%ghost %attr(644, tomcat, root) %{_var}/satellite/systemlogs/audit-review.log
%files -n spacewalk-taskomatic
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 957ee66..868c42f 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -108,15 +108,9 @@ print Spacewalk::Setup::loc("* Performing initial
configuration.\n");
my $config_opts = populate_initial_configs(\%opts, \%answers);
mkdir_mount_points($config_opts->{'mount_point'},
$config_opts->{'mount_point'} . '/redhat',
- $config_opts->{'mount_point'} . '/systemlogs',
$config_opts->{'kickstart_mount_point'});
setup_sudoers(\%opts, \%answers);
-my $aurev_fn = $config_opts->{'mount_point'} .
'/systemlogs/audit-review.log';
-qx(touch $aurev_fn);
-qx(chown tomcat $aurev_fn);
-qx(chattr +a $aurev_fn);
-
print Spacewalk::Setup::loc("* Activating $product_name.\n");
load_satellite_certificate(\%opts, \%answers);
Show replies by date