Merge pull request #841 from openSUSE/move_conf_share

move package config to /usr/share/agama/conf.d
agama-project · Nov 2, 2023 · 7ce5d8b · 7ce5d8b
2 parents 2fd181b + c7c5973
commit 7ce5d8b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/service/lib/agama/config_reader.rb b/service/lib/agama/config_reader.rb
@@ -43,7 +43,7 @@ class ConfigReader
     REMOTE_BOOT_CONFIG = "agama_boot.yaml"
 
     PATHS = [
-      "/usr/lib/agama.d",
+      "/usr/share/agama/conf.d",
       "/etc/agama.d",
       "/run/agama.d"
     ].freeze

diff --git a/service/package/gem2rpm.yml b/service/package/gem2rpm.yml
@@ -10,8 +10,8 @@
   install -m 0644 --target-directory=%{buildroot}%{_datadir}/dbus-1/agama-services %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/org.opensuse.Agama*.service
   install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama.service %{buildroot}%{_unitdir}/agama.service
   install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/share/agama-proxy-setup.service %{buildroot}%{_unitdir}/agama-proxy-setup.service
-  install --directory %{buildroot}/usr/lib/agama.d/
-  install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/conf.d/*.yaml %{buildroot}/usr/lib/agama.d/
+  install --directory %{buildroot}/usr/share/agama/conf.d
+  install -D -m 0644 %{buildroot}%{gem_base}/gems/%{mod_full_name}/conf.d/*.yaml %{buildroot}/usr/share/agama/conf.d/
 :main:
   :preamble: |-
     # Override build.rpm, see also https://github.com/openSUSE/obs-build/blob/master/configs/
@@ -40,4 +40,6 @@
     %{_datadir}/dbus-1/agama-services/org.opensuse.Agama*.service\n
     %{_unitdir}/agama.service\n
     %{_unitdir}/agama-proxy-setup.service\n
-    /usr/lib/agama.d\n"
+    %dir %{_datadir}/agama\n
+    %dir %{_datadir}/agama/conf.d\n
+    %{_datadir}/agama/conf.d\n"