Remove deprecated params from examples

The sample config files have been updated to use pki_ds_url instead of pki_ds_ldap_port and pki_ds_ldaps_port since those params have been deprecated and generate deprecation warnings.
edewata · Feb 11, 2025 · a35217d · a35217d
1 parent 9f361e7
commit a35217d
Show file tree

Hide file tree

Showing 33 changed files with 31 additions and 68 deletions.
diff --git a/base/server/examples/installation/ca-ecc.cfg b/base/server/examples/installation/ca-ecc.cfg
@@ -20,11 +20,10 @@ pki_admin_key_algorithm=SHA384withEC
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/base/server/examples/installation/ca-existing-certs-step1.cfg b/base/server/examples/installation/ca-existing-certs-step1.cfg
@@ -17,11 +17,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/base/server/examples/installation/ca-existing-certs-step2.cfg b/base/server/examples/installation/ca-existing-certs-step2.cfg
@@ -17,11 +17,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/base/server/examples/installation/ca-external-cert-step1.cfg b/base/server/examples/installation/ca-external-cert-step1.cfg
@@ -17,11 +17,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/base/server/examples/installation/ca-external-cert-step2.cfg b/base/server/examples/installation/ca-external-cert-step2.cfg
@@ -19,11 +19,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/base/server/examples/installation/ca-secure-ds-secondary.cfg b/base/server/examples/installation/ca-secure-ds-secondary.cfg
@@ -26,8 +26,6 @@ pki_ds_secure_connection_ca_pem_file=ds_signing.crt
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_hostname=primary.example.com
 pki_security_domain_https_port=8443

diff --git a/base/server/examples/installation/ca-secure-ds.cfg b/base/server/examples/installation/ca-secure-ds.cfg
@@ -24,8 +24,6 @@ pki_ds_secure_connection_ca_pem_file=ds_signing.crt
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/base/server/examples/installation/ca.cfg b/base/server/examples/installation/ca.cfg
@@ -18,11 +18,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/base/server/examples/installation/ocsp-clone.cfg b/base/server/examples/installation/ocsp-clone.cfg
@@ -18,11 +18,10 @@ pki_admin_uid=ocspadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_hostname=primary.example.com
 pki_security_domain_name=EXAMPLE

diff --git a/base/server/examples/installation/ocsp-external-certs-step1.cfg b/base/server/examples/installation/ocsp-external-certs-step1.cfg
@@ -21,11 +21,10 @@ pki_admin_uid=ocspadmin
 pki_client_database_password=Secret.123
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_hostname=ca.example.com
 pki_security_domain_name=EXAMPLE

diff --git a/base/server/examples/installation/ocsp-external-certs-step2.cfg b/base/server/examples/installation/ocsp-external-certs-step2.cfg
@@ -20,11 +20,10 @@ pki_admin_uid=ocspadmin
 pki_client_database_password=Secret.123
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_hostname=ca.example.com
 pki_security_domain_name=EXAMPLE

diff --git a/base/server/examples/installation/ocsp-standalone-step1.cfg b/base/server/examples/installation/ocsp-standalone-step1.cfg
@@ -18,11 +18,10 @@ pki_admin_uid=ocspadmin
 pki_client_database_password=Secret.123
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_ocsp_signing_nickname=ocsp_signing
 pki_subsystem_nickname=subsystem

diff --git a/base/server/examples/installation/ocsp-standalone-step2.cfg b/base/server/examples/installation/ocsp-standalone-step2.cfg
@@ -21,11 +21,10 @@ pki_admin_uid=ocspadmin
 pki_client_database_password=Secret.123
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_ocsp_signing_nickname=ocsp_signing
 pki_subsystem_nickname=subsystem

diff --git a/base/server/examples/installation/ocsp.cfg b/base/server/examples/installation/ocsp.cfg
@@ -17,11 +17,10 @@ pki_admin_uid=ocspadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/base/server/examples/installation/subca.cfg b/base/server/examples/installation/subca.cfg
@@ -18,11 +18,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_hostname=root.example.com
 pki_security_domain_user=caadmin

diff --git a/docs/installation/ca/Installing_CA_Clone_with_HSM.adoc b/docs/installation/ca/Installing_CA_Clone_with_HSM.adoc
@@ -60,11 +60,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_hostname=pki.example.com
 pki_security_domain_https_port=8443

diff --git a/docs/installation/ca/Installing_CA_with_Custom_CA_Signing_Key.adoc b/docs/installation/ca/Installing_CA_with_Custom_CA_Signing_Key.adoc
@@ -28,11 +28,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/docs/installation/ca/Installing_CA_with_Existing_Keys_in_HSM.adoc b/docs/installation/ca/Installing_CA_with_Existing_Keys_in_HSM.adoc
@@ -38,11 +38,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/docs/installation/ca/Installing_CA_with_HSM.adoc b/docs/installation/ca/Installing_CA_with_HSM.adoc
@@ -35,11 +35,10 @@ pki_admin_uid=caadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
 pki_ds_database=ca
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 

diff --git a/docs/installation/kra/Installing_KRA_Clone_with_HSM.adoc b/docs/installation/kra/Installing_KRA_Clone_with_HSM.adoc
@@ -40,11 +40,10 @@ pki_admin_uid=kraadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
 pki_ds_database=kra
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_hostname=pki.example.com
 pki_security_domain_https_port=8443

diff --git a/docs/installation/kra/Installing_KRA_with_Custom_Keys.adoc b/docs/installation/kra/Installing_KRA_with_Custom_Keys.adoc
@@ -30,11 +30,10 @@ pki_admin_uid=kraadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
 pki_ds_database=kra
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/kra/Installing_KRA_with_ECC.adoc b/docs/installation/kra/Installing_KRA_with_ECC.adoc
@@ -42,11 +42,10 @@ pki_admin_uid=kraadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
 pki_ds_database=kra
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/kra/Installing_KRA_with_HSM.adoc b/docs/installation/kra/Installing_KRA_with_HSM.adoc
@@ -38,11 +38,10 @@ pki_admin_uid=kraadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
 pki_ds_database=kra
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/kra/Installing_KRA_with_Secure_Database_Connection.adoc b/docs/installation/kra/Installing_KRA_with_Secure_Database_Connection.adoc
@@ -26,7 +26,7 @@ pki_admin_uid=kraadmin
 
 pki_client_pkcs12_password=Secret.123
 
-pki_ds_url=ldaps://localhost:636
+pki_ds_url=ldaps://localhost.localdomain:636
 pki_ds_secure_connection_ca_nickname=ds_signing
 pki_ds_secure_connection_ca_pem_file=ds_signing.crt
 

diff --git a/docs/installation/ocsp/Installing_OCSP_Clone_with_HSM.adoc b/docs/installation/ocsp/Installing_OCSP_Clone_with_HSM.adoc
@@ -41,11 +41,10 @@ pki_admin_uid=ocspadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/ocsp/Installing_OCSP_with_Custom_Keys.adoc b/docs/installation/ocsp/Installing_OCSP_with_Custom_Keys.adoc
@@ -31,11 +31,10 @@ pki_admin_uid=ocspadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/ocsp/Installing_OCSP_with_ECC.adoc b/docs/installation/ocsp/Installing_OCSP_with_ECC.adoc
@@ -43,11 +43,10 @@ pki_admin_uid=ocspadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/ocsp/Installing_OCSP_with_HSM.adoc b/docs/installation/ocsp/Installing_OCSP_with_HSM.adoc
@@ -37,11 +37,10 @@ pki_admin_uid=ocspadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/ocsp/Installing_OCSP_with_Secure_Database_Connection.adoc b/docs/installation/ocsp/Installing_OCSP_with_Secure_Database_Connection.adoc
@@ -35,15 +35,13 @@ pki_admin_uid=ocspadmin
 
 pki_client_pkcs12_password=Secret.123
 
-pki_ds_url=ldaps://localhost:636
+pki_ds_url=ldaps://localhost.localdomain:636
 pki_ds_secure_connection_ca_nickname=ds_signing
 pki_ds_secure_connection_ca_pem_file=ds_signing.crt
 
 pki_ds_base_dn=dc=ocsp,dc=pki,dc=example,dc=com
 pki_ds_database=ocsp
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/tks/Installing_TKS_with_HSM.adoc b/docs/installation/tks/Installing_TKS_with_HSM.adoc
@@ -38,11 +38,10 @@ pki_admin_uid=tksadmin
 
 pki_client_pkcs12_password=Secret.123
 
+pki_ds_url=ldap://localhost.localdomain:389
 pki_ds_base_dn=dc=tks,dc=pki,dc=example,dc=com
 pki_ds_database=tks
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin

diff --git a/docs/installation/tks/Installing_TKS_with_Secure_Database_Connection.adoc b/docs/installation/tks/Installing_TKS_with_Secure_Database_Connection.adoc
@@ -33,15 +33,13 @@ pki_admin_uid=tksadmin
 
 pki_client_pkcs12_password=Secret.123
 
-pki_ds_url=ldaps://localhost:636
+pki_ds_url=ldaps://localhost.localdomain:636
 pki_ds_secure_connection_ca_nickname=ds_signing
 pki_ds_secure_connection_ca_pem_file=ds_signing.crt
 
 pki_ds_base_dn=dc=tks,dc=pki,dc=example,dc=com
 pki_ds_database=tks
 pki_ds_password=Secret.123
-pki_ds_ldap_port=389
-pki_ds_ldaps_port=636
 
 pki_security_domain_name=EXAMPLE
 pki_security_domain_user=caadmin