Merge pull request #284 from joostvdbroek93/bugfix/install-LoginAdmin…

…Whitelist-before-aem-password-reset Make sure LoginAdminWhitelist.fragment-passwordreset.config is installed before aem-password-rest package
shinesolutions · Jul 2, 2024 · 42c1d5e · 42c1d5e
2 parents 4f38c63 + 10fb2a1
commit 42c1d5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/manifests/config_author_primary.pp b/manifests/config_author_primary.pp
@@ -290,6 +290,12 @@
     jvm_mem_opts     => $jvm_mem_opts,
     jvm_opts         => $_jvm_opts,
     osgi_configs     => $author_primary_osgi_config
+  } -> file { "${crx_quickstart_dir}/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config":
+    ensure => present,
+    source => 'puppet:///modules/aem_curator/crx-quickstart/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config',
+    mode   => '0775',
+    owner  => "aem-${aem_id}",
+    group  => "aem-${aem_id}",
   } -> archive { "${crx_quickstart_dir}/install/aem-password-reset-content-${aem_password_reset_version}.zip":
     ensure  => present,
     source  => $aem_password_reset_source,
@@ -301,12 +307,6 @@
     mode   => '0640',
     owner  => "aem-${aem_id}",
     group  => "aem-${aem_id}",
-  } -> file { "${crx_quickstart_dir}/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config":
-    ensure => present,
-    source => 'puppet:///modules/aem_curator/crx-quickstart/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config',
-    mode   => '0775',
-    owner  => "aem-${aem_id}",
-    group  => "aem-${aem_id}",
   } -> aem_resources::set_osgi_config { "${aem_id}: Set AEM OSGI config":
     aem_home_dir   => $aem_home_dir,
     aem_id         => $aem_id,

diff --git a/manifests/config_publish.pp b/manifests/config_publish.pp
@@ -281,6 +281,12 @@
     jvm_mem_opts     => $jvm_mem_opts,
     jvm_opts         => $_jvm_opts,
     osgi_configs     => $aem_osgi_configs
+  } -> file {"${crx_quickstart_dir}/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config":
+    ensure => present,
+    source => 'puppet:///modules/aem_curator/crx-quickstart/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config',
+    mode   => '0775',
+    owner  => "aem-${aem_id}",
+    group  => "aem-${aem_id}",
   } -> archive { "${crx_quickstart_dir}/install/aem-password-reset-content-${aem_password_reset_version}.zip":
     ensure => present,
     source => $aem_password_reset_source,
@@ -291,12 +297,6 @@
     mode   => '0640',
     owner  => "aem-${aem_id}",
     group  => "aem-${aem_id}",
-  } -> file {"${crx_quickstart_dir}/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config":
-    ensure => present,
-    source => 'puppet:///modules/aem_curator/crx-quickstart/install/org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment-passwordreset.config',
-    mode   => '0775',
-    owner  => "aem-${aem_id}",
-    group  => "aem-${aem_id}",
   } -> service { 'aem-publish':
     ensure => 'running',
     enable => true,