File bug-1082883_pacemaker-Install-etcpacemaker-dire... of Package pacemaker.13252

Overview Repositories Revisions Requests Users Attributes Meta

File bug-1082883_pacemaker-Install-etcpacemaker-directory-for-storing-authkey-file.patch of Package pacemaker.13252

commit f6e3ab98d6418cd3b0de007dd75feb3c750636be
Author: Gao,Yan <ygao@suse.com>
Date:   Tue Feb 27 15:02:48 2018 +0100

Build: Install /etc/pacemaker directory for storing authkey file

Index: pacemaker-1.1.18+20180126.bfe4e8042/Makefile.am
===================================================================
--- pacemaker-1.1.18+20180126.bfe4e8042.orig/Makefile.am
+++ pacemaker-1.1.18+20180126.bfe4e8042/Makefile.am
@@ -64,9 +64,11 @@ core-clean:
 
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
+	$(INSTALL) -d -m 750 $(DESTDIR)/$(PACEMAKER_CONFIG_DIR)
 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_CONFIG_DIR)
 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_CORE_DIR)
 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_BLACKBOX_DIR)
+	-chgrp $(CRM_DAEMON_GROUP) $(DESTDIR)/$(PACEMAKER_CONFIG_DIR)
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CONFIG_DIR)
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CORE_DIR)
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_BLACKBOX_DIR)
Index: pacemaker-1.1.18+20180126.bfe4e8042/configure.ac
===================================================================
--- pacemaker-1.1.18+20180126.bfe4e8042.orig/configure.ac
+++ pacemaker-1.1.18+20180126.bfe4e8042/configure.ac
@@ -1136,6 +1136,10 @@ AC_MSG_RESULT($CRM_RSCTMP_DIR)
 AC_DEFINE_UNQUOTED(CRM_RSCTMP_DIR,"$CRM_RSCTMP_DIR", Where resource agents should keep state files)
 AC_SUBST(CRM_RSCTMP_DIR)
 
+PACEMAKER_CONFIG_DIR="${sysconfdir}/pacemaker"
+AC_DEFINE_UNQUOTED(PACEMAKER_CONFIG_DIR,"$PACEMAKER_CONFIG_DIR", Where to keep configuration files like authkey)
+AC_SUBST(PACEMAKER_CONFIG_DIR)
+
 dnl Needed for the location of hostcache in CTS.py
 HA_VARLIBHBDIR=`try_extract_header_define $GLUE_HEADER HA_VARLIBHBDIR ${localstatedir}/lib/heartbeat`
 AC_SUBST(HA_VARLIBHBDIR)
Index: pacemaker-1.1.18+20180126.bfe4e8042/include/crm/lrmd.h
===================================================================
--- pacemaker-1.1.18+20180126.bfe4e8042.orig/include/crm/lrmd.h
+++ pacemaker-1.1.18+20180126.bfe4e8042/include/crm/lrmd.h
@@ -26,6 +26,7 @@
  * \ingroup lrmd
  */
 #include <stdbool.h>
+#include <crm_config.h>
 #include <crm/services.h>
 
 typedef struct lrmd_s lrmd_t;
@@ -49,7 +50,7 @@ typedef struct lrmd_key_value_s {
 #define LRMD_MIN_PROTOCOL_VERSION "1.0"
 
 /* *INDENT-OFF* */
-#define DEFAULT_REMOTE_KEY_LOCATION "/etc/pacemaker/authkey"
+#define DEFAULT_REMOTE_KEY_LOCATION PACEMAKER_CONFIG_DIR "/authkey"
 #define ALT_REMOTE_KEY_LOCATION "/etc/corosync/authkey"
 #define DEFAULT_REMOTE_PORT 3121
 #define DEFAULT_REMOTE_USERNAME "lrmd"
Index: pacemaker-1.1.18+20180126.bfe4e8042/include/crm_config.h.in
===================================================================
--- pacemaker-1.1.18+20180126.bfe4e8042.orig/include/crm_config.h.in
+++ pacemaker-1.1.18+20180126.bfe4e8042/include/crm_config.h.in
@@ -64,6 +64,9 @@
 /* Location for the Pacemaker Relax-NG Schema */
 #undef CRM_DTD_DIRECTORY
 
+/* Where to keep configuration files like authkey */
+#undef PACEMAKER_CONFIG_DIR
+
 /****** Features ******/
 
 /* Set of enabled features */
Index: pacemaker-1.1.18+20180126.bfe4e8042/pacemaker.spec.in
===================================================================
--- pacemaker-1.1.18+20180126.bfe4e8042.orig/pacemaker.spec.in
+++ pacemaker-1.1.18+20180126.bfe4e8042/pacemaker.spec.in
@@ -663,6 +663,7 @@ exit 0
 %files cli
 %defattr(-,root,root)
 
+%dir %attr (750, root, %{gname}) %{_sysconfdir}/pacemaker
 %config(noreplace) %{_sysconfdir}/logrotate.d/pacemaker
 %config(noreplace) %{_sysconfdir}/sysconfig/crm_mon

Places

File bug-1082883_pacemaker-Install-etcpacemaker-directory-for-storing-authkey-file.patch of Package pacemaker.13252

Places