Configure IPA OTP Last Token plugin on upgrade

Reviewed-By: Martin Kosek <mkosek@redhat.com>

4 files changed, 15 insertions, 23 deletions

diff --git a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am
index 1e3869bfd..d12fbcc89 100644
--- a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am
+++ b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/Makefile.am
@@ -22,7 +22,3 @@ libipa_otp_lasttoken_la_LDFLAGS = -avoid-version -export-symbols ipa-otp-lasttok
 libipa_otp_lasttoken_la_LIBADD =		\
 	$(LDAP_LIBS)				\
 	$(builddir)/../libotp/libotp.la
-
-appdir = $(IPA_DATA_DIR)
-app_DATA = otp-lasttoken-conf.ldif
-EXTRA_DIST = $(app_DATA)
diff --git a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/otp-lasttoken-conf.ldif b/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/otp-lasttoken-conf.ldif
deleted file mode 100644
index 767883848..000000000
--- a/daemons/ipa-slapi-plugins/ipa-otp-lasttoken/otp-lasttoken-conf.ldif
+++ /dev/null
@@ -1,15 +0,0 @@
-dn: cn=IPA OTP Last Token,cn=plugins,cn=config
-changetype: add
-objectclass: top
-objectclass: nsSlapdPlugin
-objectclass: extensibleObject
-cn: IPA OTP Last Token
-nsslapd-pluginpath: libipa_otp_lasttoken
-nsslapd-plugininitfunc: ipa_otp_lasttoken_init
-nsslapd-plugintype: preoperation
-nsslapd-pluginenabled: on
-nsslapd-pluginid: ipa-otp-lasttoken
-nsslapd-pluginversion: 1.0
-nsslapd-pluginvendor: Red Hat, Inc.
-nsslapd-plugindescription: IPA OTP Last Token plugin
-nsslapd-plugin-depends-on-type: database
diff --git a/install/updates/40-otp.update b/install/updates/40-otp.update
index caa21c380..241134265 100644
--- a/install/updates/40-otp.update
+++ b/install/updates/40-otp.update
@@ -20,3 +20,18 @@ dn: cn=radiusproxy,$SUFFIX
 default: objectClass: nsContainer
 default: objectClass: top
 default: cn: radiusproxy
+
+dn: cn=IPA OTP Last Token,cn=plugins,cn=config
+default:objectclass: top
+default:objectclass: nsSlapdPlugin
+default:objectclass: extensibleObject
+default:cn: IPA OTP Last Token
+default:nsslapd-pluginpath: libipa_otp_lasttoken
+default:nsslapd-plugininitfunc: ipa_otp_lasttoken_init
+default:nsslapd-plugintype: preoperation
+default:nsslapd-pluginenabled: on
+default:nsslapd-pluginid: ipa-otp-lasttoken
+default:nsslapd-pluginversion: 1.0
+default:nsslapd-pluginvendor: Red Hat, Inc.
+default:nsslapd-plugindescription: IPA OTP Last Token plugin
+default:nsslapd-plugin-depends-on-type: database
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index c15ef2ceb..3cd16519b 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -273,7 +273,6 @@ class DsInstance(service.Service):
         self.step("configuring DNS plugin", self.__config_dns_module)
         self.step("enabling entryUSN plugin", self.__enable_entryusn)
         self.step("configuring lockout plugin", self.__config_lockout_module)
-        self.step("configuring OTP last token plugin", self.__config_otp_lasttoken_module)
         self.step("creating indices", self.__create_indices)
         self.step("enabling referential integrity plugin", self.__add_referint_module)
         if enable_ssl:
@@ -584,9 +583,6 @@ class DsInstance(service.Service):
     def __config_lockout_module(self):
         self._ldap_mod("lockout-conf.ldif")
 
-    def __config_otp_lasttoken_module(self):
-        self._ldap_mod("otp-lasttoken-conf.ldif")
-
     def __repoint_managed_entries(self):
         self._ldap_mod("repoint-managed-entries.ldif", self.sub_dict)