Cleanup sudo config

spacewalk/setup/Makefile.PL

@@ -11,14 +11,11 @@ WriteMakefile(
     EXE_FILES           => ['bin/spacewalk-setup',
                             'bin/spacewalk-make-mount-points',
                             'bin/spacewalk-setup-cobbler',
-                            'bin/spacewalk-setup-httpd',
-                            'bin/spacewalk-setup-sudoers'],
+                            'bin/spacewalk-setup-httpd'],
     PREREQ_PM => {
         'Test::More' => 0,
     },
-    MAN1PODS		=> { 'lib/Spacewalk/Setup.pm' => '$(INST_MAN1DIR)/spacewalk-setup.$(MAN1EXT)',
-        'bin/spacewalk-setup-sudoers' => '$(INST_MAN1DIR)/spacewalk-setup-sudoers.$(MAN1EXT)',
-			},
+    MAN1PODS		=> { 'lib/Spacewalk/Setup.pm' => '$(INST_MAN1DIR)/spacewalk-setup.$(MAN1EXT)', },
     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
     clean               => { FILES => 'Spacewalk-Setup-*' },
 );

spacewalk/setup/bin/spacewalk-setup

@@ -130,8 +130,6 @@ if(not $opts{"skip-initial-configuration"}) {
     chown -1, $www_gid, $config_opts->{'mount_point'} . '/systems';
 }
 
-setup_sudoers();
-
 
 print Spacewalk::Setup::loc("* Configuring apache SSL virtual host.\n");
 setup_mod_ssl(\%opts, \%answers);
@@ -383,11 +381,6 @@ sub setup_cc {
       -password => 1);
 }
 
-sub setup_sudoers {
-  Spacewalk::Setup::system_or_exit(['/usr/bin/spacewalk-setup-sudoers', ''], 1,
-    'Could not setup sudo for Spacewalk commands.');
-  return;
-}
 
 sub passwords_match {
   my $password_1 = shift;

spacewalk/setup/spacewalk-setup.changes.mcalmer.master

@@ -0,0 +1,2 @@
+- drop spacewalk-setup-sudoers which does only cleanups which should be
+  applied already since several years. The functionality is obsolete

spacewalk/setup/spacewalk-setup.spec

@@ -160,7 +160,6 @@ install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/
 install -d -m 755 %{buildroot}/%{_sysconfdir}/salt/master.d/
 install -d -m 755 %{buildroot}/%{_sysconfdir}/tomcat/conf.d/
 install -m 0755 share/embedded_diskspace_check.py %{buildroot}/%{_datadir}/spacewalk/setup/
-install -m 0644 share/sudoers.* %{buildroot}/%{_datadir}/spacewalk/setup/
 install -m 0644 share/mod_ssl.conf.* %{buildroot}/%{_datadir}/spacewalk/setup/
 install -m 0644 share/tomcat_java_opts.conf %{buildroot}/%{_sysconfdir}/tomcat/conf.d/
 %if 0%{?suse_version}
@@ -181,9 +180,7 @@ install -d -m 755 %{buildroot}/%{misc_path}/spacewalk
 
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
 /usr/bin/pod2man --section=8 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-make-mount-points | gzip > $RPM_BUILD_ROOT%{_mandir}/man8/spacewalk-make-mount-points.8.gz
-/usr/bin/pod2man --section=1 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-setup-sudoers| gzip > $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-sudoers.1.gz
 /usr/bin/pod2man --section=1 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-setup-httpd | gzip > $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-httpd.1.gz
-/usr/bin/pod2man --section=1 $RPM_BUILD_ROOT/%{_bindir}/spacewalk-setup-sudoers| gzip > $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-sudoers.1.gz
 # Sphinx built manpage
 %define SPHINX_BASE_DIR %(echo %{SOURCE0}| sed -e 's/\.tar\.gz//' | sed 's@.*/@@')
 install -m 0644 %{_builddir}/%{SPHINX_BASE_DIR}/out/spacewalk-cobbler-setup.1 $RPM_BUILD_ROOT%{_mandir}/man1/spacewalk-setup-cobbler.1
@@ -218,14 +215,6 @@ if [ -d /var/cache/salt/master/thin ]; then
   rm -rf /var/cache/salt/master/thin
 fi
 
-# sudoers file is now in /etc/sudoers.d/spacewalk
-if [ -f /etc/sudoers.d/spacewalk -a -f /etc/sudoers.d/susemanager ]; then
-    # do not fail if one is just a link to the other one
-    cp /etc/sudoers.d/spacewalk /etc/sudoers.d/spacewalk.tmp
-    rm -f /etc/sudoers.d/spacewalk /etc/sudoers.d/susemanager
-    mv /etc/sudoers.d/spacewalk.tmp /etc/sudoers.d/spacewalk
-fi
-
 if grep 'authn_spacewalk' /etc/cobbler/modules.conf > /dev/null 2>&1; then
     sed -i 's/module = authn_spacewalk/module = authentication.spacewalk/' /etc/cobbler/modules.conf
 fi
@@ -291,7 +280,6 @@ make test
 %{_bindir}/spacewalk-setup-httpd
 %{_bindir}/spacewalk-make-mount-points
 %{_bindir}/spacewalk-setup-cobbler
-%{_bindir}/spacewalk-setup-sudoers
 %{_mandir}/man[13]/*.[13]*
 %dir %attr(0755, root, root) %{_prefix}/share/salt-formulas/
 %dir %attr(0755, root, root) %{_prefix}/share/salt-formulas/states/

susemanager/susemanager.changes.mcalmer.cleanup-sudo-config

@@ -0,0 +1 @@
+- drop unused susemanager-upgrade.sh