diff --git a/install/share/Makefile.am b/install/share/Makefile.am index 5753de9f7..96ad94abd 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -101,7 +101,9 @@ dist_app_DATA = \ ipaca_default.ini \ ipaca_customize.ini \ ipaca_softhsm2.ini \ + pki-acme-configsources.conf.template \ pki-acme-database.conf.template \ + pki-acme-engine.conf.template \ pki-acme-issuer.conf.template \ $(NULL) diff --git a/install/share/pki-acme-configsources.conf.template b/install/share/pki-acme-configsources.conf.template new file mode 100644 index 000000000..f82ac2157 --- /dev/null +++ b/install/share/pki-acme-configsources.conf.template @@ -0,0 +1,2 @@ +engine.class=org.dogtagpki.acme.server.ACMEEngineConfigFileSource +engine.filename=/etc/pki/pki-tomcat/acme/engine.conf diff --git a/install/share/pki-acme-engine.conf.template b/install/share/pki-acme-engine.conf.template new file mode 100644 index 000000000..cb9898c5f --- /dev/null +++ b/install/share/pki-acme-engine.conf.template @@ -0,0 +1,2 @@ +enabled=false +wildcard=false diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index fd13bc951..ce841c23d 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -118,7 +118,9 @@ class BasePathNamespace: PKI_TOMCAT_ALIAS_PWDFILE_TXT = "/etc/pki/pki-tomcat/alias/pwdfile.txt" PKI_TOMCAT_PASSWORD_CONF = "/etc/pki/pki-tomcat/password.conf" PKI_TOMCAT_SERVER_XML = "/etc/pki/pki-tomcat/server.xml" + PKI_ACME_CONFIGSOURCES_CONF = "/etc/pki/pki-tomcat/acme/configsources.conf" PKI_ACME_DATABASE_CONF = "/etc/pki/pki-tomcat/acme/database.conf" + PKI_ACME_ENGINE_CONF = "/etc/pki/pki-tomcat/acme/engine.conf" PKI_ACME_ISSUER_CONF = "/etc/pki/pki-tomcat/acme/issuer.conf" ETC_REDHAT_RELEASE = "/etc/redhat-release" RESOLV_CONF = "/etc/resolv.conf" diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 18f4163f8..ce20bb37c 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1559,7 +1559,10 @@ class CAInstance(DogtagInstance): # write configuration files files = [ + ('pki-acme-configsources.conf.template', + paths.PKI_ACME_CONFIGSOURCES_CONF), ('pki-acme-database.conf.template', paths.PKI_ACME_DATABASE_CONF), + ('pki-acme-engine.conf.template', paths.PKI_ACME_ENGINE_CONF), ('pki-acme-issuer.conf.template', paths.PKI_ACME_ISSUER_CONF), ] sub_dict = dict(