Commit 1404418e authored by Noah Hilverling's avatar Noah Hilverling

Fix paths for icingadb-redis package

parent 2895ae42
Pipeline #7899 passed with stages
in 7 minutes and 42 seconds
...@@ -5,7 +5,7 @@ After=network-online.target ...@@ -5,7 +5,7 @@ After=network-online.target
Wants=network-online.target Wants=network-online.target
[Service] [Service]
ExecStart=/usr/bin/icinga-redis-server /etc/icinga2/icingadb-redis.conf --supervised systemd ExecStart=/usr/bin/icinga-redis-server /etc/icinga-redis/icingadb-redis.conf
ExecStop=/usr/libexec/icinga-redis-shutdown ExecStop=/usr/libexec/icinga-redis-shutdown
Type=notify Type=notify
User=icinga-redis User=icinga-redis
......
...@@ -7,8 +7,8 @@ Type=notify ...@@ -7,8 +7,8 @@ Type=notify
User=icinga-redis User=icinga-redis
Group=icinga-redis Group=icinga-redis
PrivateTmp=true PrivateTmp=true
PIDFile=/var/run/icinga2/icingadb-redis.pid PIDFile=/var/run/icinga-redis/icingadb-redis.pid
ExecStart=/usr/sbin/icinga-redis-server /etc/icinga2/icingadb-redis.conf ExecStart=/usr/sbin/icinga-redis-server /etc/icinga-redis/icingadb-redis.conf
LimitNOFILE=10240 LimitNOFILE=10240
Restart=on-failure Restart=on-failure
......
...@@ -113,6 +113,9 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} ...@@ -113,6 +113,9 @@ ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name}
%endif # suse %endif # suse
#%%install redis #%%install redis
install -d -m 0755 %{buildroot}%{_sharedstatedir}/icinga-redis/icingadb-redis
# Install custom systemd service file for icingadb-redis. Source1 is SUSE, Source2 is RHEL. # Install custom systemd service file for icingadb-redis. Source1 is SUSE, Source2 is RHEL.
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/icingadb-redis.service install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/icingadb-redis.service
...@@ -209,6 +212,7 @@ rm -rf %{buildroot} ...@@ -209,6 +212,7 @@ rm -rf %{buildroot}
#%%doc AUTHORS COPYING README.md #%%doc AUTHORS COPYING README.md
%config(noreplace) %attr(0640,icinga-redis,icinga-redis) %{_sysconfdir}/icinga-redis/icingadb-redis.conf %config(noreplace) %attr(0640,icinga-redis,icinga-redis) %{_sysconfdir}/icinga-redis/icingadb-redis.conf
%attr(644,root,root) %{_unitdir}/icingadb-redis.service %attr(644,root,root) %{_unitdir}/icingadb-redis.service
%dir %attr(750,icinga-redis,icinga-redis) %{_sharedstatedir}/icinga-redis/icingadb-redis
%changelog %changelog
* Fri Dec 13 2019 Henrik Triem <henrik.triem@icinga.com> 0.0.0-1 * Fri Dec 13 2019 Henrik Triem <henrik.triem@icinga.com> 0.0.0-1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment