summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2015-05-27 09:05:23 +0000
committerJan Cholasta <jcholast@redhat.com>2015-05-29 08:00:33 +0000
commit5a7b153ad238ebdf8aa3c85fdf5c308640d8457b (patch)
treeaff9e03dfc7edf18a5b9826107f768cf49ebc9cf
parentd5b6c8360116857623b4b67a42ed3788df2ba24a (diff)
downloadfreeipa-5a7b153ad238ebdf8aa3c85fdf5c308640d8457b.tar.gz
freeipa-5a7b153ad238ebdf8aa3c85fdf5c308640d8457b.tar.xz
freeipa-5a7b153ad238ebdf8aa3c85fdf5c308640d8457b.zip
install: Make a package out of ipaserver.install.server
Until ipa-server-install, ipa-replica-install and ipa-server-upgrade are merged into a single code base, keep their respective bits in separate modules in the package. https://fedorahosted.org/freeipa/ticket/4468 Reviewed-By: Martin Basti <mbasti@redhat.com>
-rw-r--r--freeipa.spec.in1
-rw-r--r--ipaserver/install/server/__init__.py5
-rw-r--r--ipaserver/install/server/upgrade.py (renamed from ipaserver/install/server.py)0
-rwxr-xr-xsetup.py1
4 files changed, 7 insertions, 0 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in
index 7dc576256..09dd66eec 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -705,6 +705,7 @@ fi
%dir %{python_sitelib}/ipaserver
%dir %{python_sitelib}/ipaserver/install
%dir %{python_sitelib}/ipaserver/install/plugins
+%dir %{python_sitelib}/ipaserver/install/server
%dir %{python_sitelib}/ipaserver/advise
%dir %{python_sitelib}/ipaserver/advise/plugins
%dir %{python_sitelib}/ipaserver/plugins
diff --git a/ipaserver/install/server/__init__.py b/ipaserver/install/server/__init__.py
new file mode 100644
index 000000000..82b551fcb
--- /dev/null
+++ b/ipaserver/install/server/__init__.py
@@ -0,0 +1,5 @@
+#
+# Copyright (C) 2015 FreeIPA Contributors see COPYING for license
+#
+
+from .upgrade import upgrade_configuration
diff --git a/ipaserver/install/server.py b/ipaserver/install/server/upgrade.py
index c08b74828..c08b74828 100644
--- a/ipaserver/install/server.py
+++ b/ipaserver/install/server/upgrade.py
diff --git a/setup.py b/setup.py
index af7964d60..434aeb8cc 100755
--- a/setup.py
+++ b/setup.py
@@ -84,6 +84,7 @@ setup(
'ipaserver.plugins',
'ipaserver.install',
'ipaserver.install.plugins',
+ 'ipaserver.install.server',
],
scripts=['ipa'],
data_files = [('share/man/man1', ["ipa.1"])],