Commit 6da1826b authored by Henrik Triem's avatar Henrik Triem
Browse files

Remove default locations from build

parent 917eaafc
Pipeline #7334 failed with stages
in 4 minutes and 43 seconds
...@@ -25,7 +25,7 @@ Index: redis.conf ...@@ -25,7 +25,7 @@ Index: redis.conf
# Creating a pid file is best effort: if Redis is not able to create it # Creating a pid file is best effort: if Redis is not able to create it
# nothing bad happens, the server will start and run normally. # nothing bad happens, the server will start and run normally.
-pidfile /var/run/redis_6379.pid -pidfile /var/run/redis_6379.pid
+pidfile /var/run/icinga-redis/default.pid +pidfile /var/run/icinga-redis/redis.pid
# Specify the server verbosity level. # Specify the server verbosity level.
# This can be one of: # This can be one of:
...@@ -35,7 +35,7 @@ Index: redis.conf ...@@ -35,7 +35,7 @@ Index: redis.conf
# output for logging but daemonize, logs will be sent to /dev/null # output for logging but daemonize, logs will be sent to /dev/null
-logfile "" -logfile ""
+# logfile "" +# logfile ""
+logfile /var/log/icinga-redis/default.log +logfile /var/log/icinga-redis/redis.log
# To enable logging to the system logger, just set 'syslog-enabled' to yes, # To enable logging to the system logger, just set 'syslog-enabled' to yes,
# and optionally update the other syslog parameters to suit your needs. # and optionally update the other syslog parameters to suit your needs.
...@@ -44,7 +44,7 @@ Index: redis.conf ...@@ -44,7 +44,7 @@ Index: redis.conf
# #
# Note that you must specify a directory here, not a file name. # Note that you must specify a directory here, not a file name.
-dir ./ -dir ./
+dir /var/lib/icinga-redis/default/ +dir /var/lib/icinga-redis/redis/
################################# REPLICATION ################################# ################################# REPLICATION #################################
...@@ -55,9 +55,9 @@ Index: sentinel.conf ...@@ -55,9 +55,9 @@ Index: sentinel.conf
@@ -1,4 +1,8 @@ @@ -1,4 +1,8 @@
# Example sentinel.conf # Example sentinel.conf
+# +#
+pidfile /var/run/icinga_redis/sentinel-default.pid +pidfile /var/run/icinga_redis/sentinel.pid
+loglevel notice +loglevel notice
+logfile /var/log/icinga_redis/sentinel-default.log +logfile /var/log/icinga_redis/sentinel.log
# *** IMPORTANT *** # *** IMPORTANT ***
# #
...@@ -85,8 +85,8 @@ install -m 0750 -d \ ...@@ -85,8 +85,8 @@ install -m 0750 -d \
%{buildroot}%{_log_dir} \ %{buildroot}%{_log_dir} \
%{buildroot}%{_data_dir} \ %{buildroot}%{_data_dir} \
%{buildroot}%{_conf_dir} \ %{buildroot}%{_conf_dir} \
%{buildroot}%{_log_dir}/default \ %{buildroot}%{_log_dir} \
%{buildroot}%{_data_dir}/default %{buildroot}%{_data_dir}
install -Dpm 0755 src/%{src_name}-benchmark %{buildroot}%{_bindir}/%{name}-benchmark install -Dpm 0755 src/%{src_name}-benchmark %{buildroot}%{_bindir}/%{name}-benchmark
install -Dpm 0755 src/%{src_name}-cli %{buildroot}%{_bindir}/%{name}-cli install -Dpm 0755 src/%{src_name}-cli %{buildroot}%{_bindir}/%{name}-cli
...@@ -161,7 +161,6 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue" ...@@ -161,7 +161,6 @@ echo "See %{_docdir}/%{name}/README.SUSE to continue"
%doc README.SUSE %doc README.SUSE
%config(noreplace) %attr(-,root,%{name}) %{_conf_dir}/ %config(noreplace) %attr(-,root,%{name}) %{_conf_dir}/
%dir %attr(0750,%{name},%{name}) %{_data_dir} %dir %attr(0750,%{name},%{name}) %{_data_dir}
%dir %attr(0750,%{name},%{name}) %{_data_dir}/default
%dir %attr(0750,%{name},%{name}) %{_log_dir} %dir %attr(0750,%{name},%{name}) %{_log_dir}
%changelog %changelog
Supports Markdown
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