summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbhijeet Kasurde <akasurde@redhat.com>2017-01-24 12:45:15 +0530
committerMartin Babinsky <mbabinsk@redhat.com>2017-01-24 09:51:39 +0100
commitc56e02b3c5257edbfd3709848ca7eda07e271e38 (patch)
tree261f497a9060ee7655a6fec77375a5bbb3b4b50c
parentceec512b09002e8cf9388873418644ec584db30a (diff)
downloadfreeipa-c56e02b3c5257edbfd3709848ca7eda07e271e38.tar.gz
freeipa-c56e02b3c5257edbfd3709848ca7eda07e271e38.tar.xz
freeipa-c56e02b3c5257edbfd3709848ca7eda07e271e38.zip
Remove deprecated ipa-upgradeconfig command
Fixes https://fedorahosted.org/freeipa/ticket/6620 Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
-rw-r--r--freeipa.spec.in2
-rw-r--r--install/tools/Makefile.am1
-rwxr-xr-xinstall/tools/ipa-upgradeconfig26
-rw-r--r--install/tools/man/Makefile.am1
-rw-r--r--install/tools/man/ipa-upgradeconfig.842
5 files changed, 0 insertions, 72 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 99820d1c0..a7e05f360 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -1099,7 +1099,6 @@ fi
%{_sbindir}/ipa-nis-manage
%{_sbindir}/ipa-managed-entries
%{_sbindir}/ipactl
-%{_sbindir}/ipa-upgradeconfig
%{_sbindir}/ipa-advise
%{_sbindir}/ipa-cacert-manage
%{_sbindir}/ipa-winsync-migrate
@@ -1158,7 +1157,6 @@ fi
%{_mandir}/man1/ipa-managed-entries.1*
%{_mandir}/man1/ipa-ldap-updater.1*
%{_mandir}/man8/ipactl.8*
-%{_mandir}/man8/ipa-upgradeconfig.8*
%{_mandir}/man1/ipa-backup.1*
%{_mandir}/man1/ipa-restore.1*
%{_mandir}/man1/ipa-advise.1*
diff --git a/install/tools/Makefile.am b/install/tools/Makefile.am
index 74f428ec4..f2c2ce295 100644
--- a/install/tools/Makefile.am
+++ b/install/tools/Makefile.am
@@ -23,7 +23,6 @@ dist_sbin_SCRIPTS = \
ipa-managed-entries \
ipa-ldap-updater \
ipa-otptoken-import \
- ipa-upgradeconfig \
ipa-backup \
ipa-restore \
ipa-advise \
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
deleted file mode 100755
index 5f3a2b4a2..000000000
--- a/install/tools/ipa-upgradeconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/python2
-#
-# Authors:
-# Rob Crittenden <rcritten@redhat.com>
-#
-# Copyright (C) 2009 Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-
-if __name__ == '__main__':
- sys.exit("Please run the 'ipa-server-upgrade' command to upgrade the "
- "IPA server.")
diff --git a/install/tools/man/Makefile.am b/install/tools/man/Makefile.am
index b1fba6de7..0d06ec730 100644
--- a/install/tools/man/Makefile.am
+++ b/install/tools/man/Makefile.am
@@ -31,5 +31,4 @@ dist_man1_MANS = \
dist_man8_MANS = \
ipactl.8 \
- ipa-upgradeconfig.8 \
$(NULL)
diff --git a/install/tools/man/ipa-upgradeconfig.8 b/install/tools/man/ipa-upgradeconfig.8
deleted file mode 100644
index 43e2ab90e..000000000
--- a/install/tools/man/ipa-upgradeconfig.8
+++ /dev/null
@@ -1,42 +0,0 @@
-.\" A man page for ipa-upgradeconfig
-.\" Copyright (C) 2010 Red Hat, Inc.
-.\"
-.\" This program is free software; you can redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as published by
-.\" the Free Software Foundation, either version 3 of the License, or
-.\" (at your option) any later version.
-.\"
-.\" This program is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-.\" General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with this program. If not, see <http://www.gnu.org/licenses/>.
-.\"
-.\" Author: Rob Crittenden <rcritten@redhat.com>
-.\"
-.TH "ipa-upgradeconfig" "8" "Jun 18 2012" "freeipa" ""
-.SH "NAME"
-ipa\-upgradeconfig \- Upgrade the IPA Apache configuration
-.SH "SYNOPSIS"
-ipa\-upgradeconfig
-.SH "DESCRIPTION"
-A tool to update the IPA Apache configuration during an upgrade.
-
-It examines the VERSION value in the head of \fI/etc/httpd/conf.d/ipa.conf\fR and \fI/etc/httpd/conf.d/ipa\-rewrite.conf\fR and compares this with the templates. If an update is needed then new files are written.
-
-It also will convert a CA configured to be accessible via ports 9443, 9444, 9445 and 9446 to be proxied by the IPA web server on ports 80 and 443.
-
-This is not intended to be run by an end\-user. It is executed when the IPA rpms are upgraded. This must be run as the root user.
-.SH "OPTIONS"
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-Enable debug logging when more verbose output is needed
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Output only errors
-.SH "EXIT STATUS"
-0 if the update was successful or there was nothing to do
-
-1 if an error occurred