diff options
author | Rob Crittenden <rcritten@redhat.com> | 2012-01-20 13:30:25 -0500 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2012-01-23 16:08:03 +0100 |
commit | 66e59d59f50c6293ab114736888c9f35d8343bd1 (patch) | |
tree | 455a8df36f935db1e5fe5eeec388dd91e5a724d4 | |
parent | 59a3714507bcbe4162f37674f565e5b87db7f586 (diff) | |
download | freeipa-66e59d59f50c6293ab114736888c9f35d8343bd1.tar.gz freeipa-66e59d59f50c6293ab114736888c9f35d8343bd1.tar.xz freeipa-66e59d59f50c6293ab114736888c9f35d8343bd1.zip |
Update and package ipa-upgradeconfig man page.
Require that the tool be run as root to avoid a permission-related
backtrace.
https://fedorahosted.org/freeipa/ticket/1758
-rw-r--r-- | freeipa.spec.in | 1 | ||||
-rw-r--r-- | install/tools/ipa-upgradeconfig | 3 | ||||
-rw-r--r-- | install/tools/man/Makefile.am | 1 | ||||
-rw-r--r-- | install/tools/man/ipa-upgradeconfig.8 | 4 |
4 files changed, 8 insertions, 1 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index b96af42eb..5ec86257d 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -557,6 +557,7 @@ fi %{_mandir}/man1/ipa-managed-entries.1.gz %{_mandir}/man1/ipa-ldap-updater.1.gz %{_mandir}/man8/ipactl.8.gz +%{_mandir}/man8/ipa-upgradeconfig.8.gz %{_mandir}/man1/ipa-compliance.1.gz %files server-selinux diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 8c4d9a260..2cd3ef376 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -164,6 +164,9 @@ def main(): exit gracefully. """ + if not os.geteuid()==0: + sys.exit("\nYou must be root to run this script.\n") + try: krbctx = krbV.default_context() except krbV.Krb5Error, e: diff --git a/install/tools/man/Makefile.am b/install/tools/man/Makefile.am index f1c68516a..456baa56d 100644 --- a/install/tools/man/Makefile.am +++ b/install/tools/man/Makefile.am @@ -22,6 +22,7 @@ man1_MANS = \ man8_MANS = \ ipactl.8 \ + ipa-upgradeconfig.8 \ $(NULL) install-data-hook: diff --git a/install/tools/man/ipa-upgradeconfig.8 b/install/tools/man/ipa-upgradeconfig.8 index 76e2782a4..442f05482 100644 --- a/install/tools/man/ipa-upgradeconfig.8 +++ b/install/tools/man/ipa-upgradeconfig.8 @@ -26,7 +26,9 @@ 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. -This is not intended to be run by an end\-user. It is executed when the IPA rpms are upgraded. +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 "EXIT STATUS" 0 if the update was successful or there was nothing to do |