Merge pull request #176 from kbrock/sample_cable

Use standard rpm semantics for cable.yml sample file
ManageIQ · Aug 18, 2021 · 1dca31f · 1dca31f
2 parents 1d172a5 + 7b66191
commit 1dca31f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/rpm_spec/manageiq.spec.in b/rpm_spec/manageiq.spec.in
@@ -99,6 +99,9 @@ cd %{_builddir}
 %{__mv} %{buildroot}%{app_root}/public/ui/service/webpack_modules_manifest.json %{buildroot}%{manifest_root}/webpack_modules_manifest_service_ui.json
 %{__mv} %{buildroot}%{app_root}/public/ui/service/webpack_packages_manifest.json %{buildroot}%{manifest_root}/webpack_packages_manifest_service_ui.json
 
+#sample configuration files
+%{__mv} %{buildroot}%{app_root}/config/cable.yml.sample %{buildroot}%{app_root}/config/cable.yml
+
 ## from appliance
 #symlink some executables
 %{__mkdir} -p %{buildroot}/%{_bindir}

diff --git a/rpm_spec/subpackages/manageiq-core b/rpm_spec/subpackages/manageiq-core
@@ -35,7 +35,6 @@ do
 done
 
 %post core
-%{__cp} -f %{app_root}/config/cable.yml.sample %{app_root}/config/cable.yml
 # These files are not owned by the rpm.
 #  For upgrades, ensure they have the correct group privs
 #  so root and manageiq users can read them.
@@ -49,12 +48,12 @@ done
 %files core
 %defattr(-,root,root,-)
 %{app_root}
-%config(noreplace) %{app_root}/certs
 %attr(-,manageiq,manageiq) %{app_root}/certs
 %attr(-,manageiq,manageiq) %{app_root}/config
 %attr(-,manageiq,manageiq) %{app_root}/log
 %attr(-,manageiq,manageiq) %{app_root}/tmp
 %attr(-,manageiq,manageiq) %{app_root}/data/git_repos
+%config(noreplace) %{app_root}/config/cable.yml
 %exclude %{app_root}/public/pictures
 %exclude %{app_root}/public/assets
 %exclude %{app_root}/public/packs