summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am6
-rw-r--r--contrib/sssd.spec.in4
-rw-r--r--src/config/setup.py1
-rw-r--r--src/config/sssd_upgrade_config.py (renamed from src/config/upgrade_config.py)0
4 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 7d64cca3..adf912c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,9 +63,6 @@ sssdlibexec_PROGRAMS = \
ldap_child \
proxy_child
-dist_sssdlibexec_SCRIPTS = \
- src/config/upgrade_config.py
-
if HAVE_CHECK
non_interactive_check_based_tests = \
sysdb-tests \
@@ -148,7 +145,8 @@ dist_noinst_SCRIPTS = \
src/config/setup.py \
src/config/ipachangeconf.py \
src/config/SSSDConfig.py \
- src/config/SSSDConfigTest.py
+ src/config/SSSDConfigTest.py \
+ src/config/sssd_upgrade_config.py
dist_noinst_DATA = \
src/config/testconfigs/sssd-valid.conf \
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 3f6a0f1b..59fc132e 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -212,10 +212,6 @@ rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
/sbin/chkconfig --add %{servicename}
-if [ $1 -ge 2 ] ; then
-# a one-time upgrade from confdb v1 to v2, only if upgrading
- python %{_libexecdir}/%{servicename}/upgrade_config.py
-fi
%preun
if [ $1 = 0 ]; then
diff --git a/src/config/setup.py b/src/config/setup.py
index 46a81060..16cc5407 100644
--- a/src/config/setup.py
+++ b/src/config/setup.py
@@ -31,5 +31,6 @@ setup(
py_modules=[
'SSSDConfig',
'ipachangeconf',
+ 'sssd_upgrade_config',
],
)
diff --git a/src/config/upgrade_config.py b/src/config/sssd_upgrade_config.py
index 62ffe527..62ffe527 100644
--- a/src/config/upgrade_config.py
+++ b/src/config/sssd_upgrade_config.py