diff options
Diffstat (limited to 'ipa-server/ipa-install')
-rw-r--r-- | ipa-server/ipa-install/ipa-replica-install | 3 | ||||
-rw-r--r-- | ipa-server/ipa-install/ipa-replica-manage | 18 | ||||
-rw-r--r-- | ipa-server/ipa-install/ipa-replica-prepare | 3 | ||||
-rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 5 |
4 files changed, 15 insertions, 14 deletions
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install index a881071b7..e7a8daed9 100644 --- a/ipa-server/ipa-install/ipa-replica-install +++ b/ipa-server/ipa-install/ipa-replica-install @@ -28,6 +28,7 @@ from ipa import ipautil from ipaserver import dsinstance, replication, installutils, krbinstance, service from ipaserver import httpinstance, ntpinstance, certs, ipaldap +from ipaserver import version class ReplicaConfig: def __init__(self): @@ -41,7 +42,7 @@ class ReplicaConfig: def parse_options(): from optparse import OptionParser - parser = OptionParser() + parser = OptionParser(version=version.VERSION) parser.add_option("-N", "--no-ntp", dest="conf_ntp", action="store_false", help="do not configure ntp", default=True) parser.add_option("-d", "--debug", dest="debug", action="store_true", diff --git a/ipa-server/ipa-install/ipa-replica-manage b/ipa-server/ipa-install/ipa-replica-manage index dd58907c5..28aceeb53 100644 --- a/ipa-server/ipa-install/ipa-replica-manage +++ b/ipa-server/ipa-install/ipa-replica-manage @@ -17,11 +17,19 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +import sys + +import getpass, ldap, re, krbV +import traceback, logging + +from ipa import ipautil +from ipaserver import replication, ipaldap, dsinstance, installutils +from ipaserver import version def parse_options(): from optparse import OptionParser - parser = OptionParser() + parser = OptionParser(version=version.VERSION) parser.add_option("-H", "--host", dest="host", help="starting host") parser.add_option("-p", "--password", dest="dirman_passwd", help="Directory Manager password") parser.add_option("-v", "--verbose", dest="verbose", action="store_true", default=False, @@ -138,14 +146,6 @@ def main(): synch_master(r, args[1]) try: - import sys - - import getpass, ldap, re, krbV - import traceback, logging - - from ipa import ipautil - from ipaserver import replication, ipaldap, dsinstance, installutils - main() except KeyboardInterrupt: sys.exit(1) diff --git a/ipa-server/ipa-install/ipa-replica-prepare b/ipa-server/ipa-install/ipa-replica-prepare index 81a98f113..4090ad8a1 100644 --- a/ipa-server/ipa-install/ipa-replica-prepare +++ b/ipa-server/ipa-install/ipa-replica-prepare @@ -29,6 +29,7 @@ from optparse import OptionParser import ipa.config from ipa import ipautil from ipaserver import dsinstance, installutils, certs, ipaldap +from ipaserver import version import ldap def usage(): @@ -36,7 +37,7 @@ def usage(): sys.exit(1) def parse_options(): - parser = OptionParser() + parser = OptionParser(version=version.VERSION) args = ipa.config.init_config(sys.argv) options, args = parser.parse_args(args) diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index 09fba19c8..e1cca3930 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -24,8 +24,6 @@ # openldap-clients # nss-tools -VERSION = "%prog .1" - import sys import os import socket @@ -46,13 +44,14 @@ import ipaserver.httpinstance import ipaserver.ntpinstance from ipaserver import service +from ipaserver import version from ipaserver.installutils import * from ipa import sysrestore from ipa.ipautil import * def parse_options(): - parser = OptionParser(version=VERSION) + parser = OptionParser(version=version.VERSION) parser.add_option("-u", "--user", dest="ds_user", help="ds user") parser.add_option("-r", "--realm", dest="realm_name", |