Merge pull request #1594 from craigcomstock/ENT-12658/master

craigcomstock · web-flow · commit 35be912c3665 · 2025-08-27T10:26:58.000-05:00
Marked application/config/config.php as a configuration file in packages
diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in
@@ -385,6 +385,9 @@ exit 0
 
 # No-one should need access to anything under share/GUI
 %defattr(400,root,root,400)
+# We can change these configuration files as part of masterfiles policy so need to mark as configs
+%config(noreplace) %prefix/share/GUI/application/config/config.php
+%config(noreplace) %prefix/share/GUI/api/modules/inventory/config/config.php
 %prefix/share/GUI
 
 # Base policy
diff --git a/packaging/cfengine-nova-hub/debian/conffiles b/packaging/cfengine-nova-hub/debian/conffiles
@@ -0,0 +1,2 @@
+/var/cfengine/share/GUI/application/config/config.php
+/var/cfengine/share/GUI/api/modules/inventory/config/config.php

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+/var/cfengine/share/GUI/application/config/config.php`
	`2`	`+/var/cfengine/share/GUI/api/modules/inventory/config/config.php`