Attachment #549504 for bug #667872

View | Details | Raw Unified | Return to bug 667872
Collapse All | Expand All




# conf.d file for proof daemon
#
# Please refer to the proofd(1) man(1) page for more information on 
# command line parameters. 
#
PROOFD_OPTS=

# Specify your base of your PROOF directory here.  If left blank, it
# will use the system default (e.g., /usr/share/root/proof). 
# Note, however, that ROOT recommends that this directory is shared (via
# NFS or similar) among all the nodes of the cluster.
PROOF_DIR=




#!/sbin/openrc-run
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

depend() {
    need root-file-server
    use logger
}

start() {
    ebegin "Starting parallel ROOT facility server"
    start-stop-daemon --start --quiet \
	--pidfile /var/run/proofd.pid \
	--exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
    pidof /usr/bin/proofd > /var/run/proofd.pid
    eend $?
}

stop() {
    ebegin "Stopping parallel ROOT facility server"
    start-stop-daemon --stop --quiet \
	--pidfile /var/run/proofd.pid \
	--exec /usr/bin/proofd
    eend $?
}




From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001
From: Guilherme Amadio <amadio@cern.ch>
Date: Wed, 27 Jun 2018 15:08:07 +0200
Subject: [PATCH] Do not exclude etc/http directory from installation

This was an unintended side-effect of a previous commit:
9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1.
---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c760d0fdb..a3a0f59925 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
                          PATTERN "rootd.xinetd" EXCLUDE
                          PATTERN "proofd.xinetd" EXCLUDE
                          PATTERN "root.mimes" EXCLUDE
-                         PATTERN "cmake" EXCLUDE
-                         PATTERN "http" EXCLUDE )
+                         PATTERN "cmake" EXCLUDE )
   install(DIRECTORY fonts/  DESTINATION ${CMAKE_INSTALL_FONTDIR})
   install(DIRECTORY icons/  DESTINATION ${CMAKE_INSTALL_ICONDIR})
   install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
-- 
2.18.0


Lines 1-8 Link Here

(-)a/sci-physics/root/files/rootd.confd (-8 lines)
1	# conf.d file for root daemon
2
3	# User to run as (default is `rootd')
4	ROOTD_USER="rootd"
5
6	# Please refer to the rootd(1) man(1) page for more information on
7	# command line parameters.
8	ROOTD_OPTS=""




#!/sbin/openrc-run
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

depend() {
    need net
    use logger
    provide root-file-server
}

start() {
    ebegin "Starting ROOT file server"
    pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
	--pidfile /var/run/rootd.pid \
	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
    retval=$?
    echo ${ROOTD_PID} > /var/run/rootd.pid
    eend ${retval}
}

stop() {
    ebegin "Stopping ROOT file server"
    start-stop-daemon --stop --quiet \
	--pidfile /var/run/rootd.pid \
	--exec /usr/bin/rootd
    eend $?
}

Return to bug 667872

Lines 1-12 Link Here

(-)a/sci-physics/root/files/proofd.confd (-12 lines)
1	# conf.d file for proof daemon
2	#
3	# Please refer to the proofd(1) man(1) page for more information on
4	# command line parameters.
5	#
6	PROOFD_OPTS=
7
8	# Specify your base of your PROOF directory here. If left blank, it
9	# will use the system default (e.g., /usr/share/root/proof).
10	# Note, however, that ROOT recommends that this directory is shared (via
11	# NFS or similar) among all the nodes of the cluster.
12	PROOF_DIR=

Lines 1-25 Link Here

(-)a/sci-physics/root/files/proofd.initd (-25 lines)
1	#!/sbin/openrc-run
2	# Copyright 1999-2012 Gentoo Foundation
3	# Distributed under the terms of the GNU General Public License v2
4
5	depend() {
6	need root-file-server
7	use logger
8	}
9
10	start() {
11	ebegin "Starting parallel ROOT facility server"
12	start-stop-daemon --start --quiet \
13	--pidfile /var/run/proofd.pid \
14	--exec /usr/bin/proofd -- ${PROOFD_OPTS} ${PROOF_DIR}
15	pidof /usr/bin/proofd > /var/run/proofd.pid
16	eend $?
17	}
18
19	stop() {
20	ebegin "Stopping parallel ROOT facility server"
21	start-stop-daemon --stop --quiet \
22	--pidfile /var/run/proofd.pid \
23	--exec /usr/bin/proofd
24	eend $?
25	}

Lines 1-28 Link Here

(-)a/sci-physics/root/files/root-6.14.00-http.patch (-28 lines)
1	From bed1568548d7a47785d8fe24ec7a9ce5799040ff Mon Sep 17 00:00:00 2001
2	From: Guilherme Amadio <amadio@cern.ch>
3	Date: Wed, 27 Jun 2018 15:08:07 +0200
4	Subject: [PATCH] Do not exclude etc/http directory from installation
5
6	This was an unintended side-effect of a previous commit:
7	9b4d0d8dccbd48d21b0f7c79b6eaf94428f691b1.
8	---
9	CMakeLists.txt \| 3 +--
10	1 file changed, 1 insertion(+), 2 deletions(-)
11
12	diff --git a/CMakeLists.txt b/CMakeLists.txt
13	index 4c760d0fdb..a3a0f59925 100644
14	--- a/CMakeLists.txt
15	+++ b/CMakeLists.txt
16	@@ -426,8 +426,7 @@ if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_INSTALL_PREFIX)
17	PATTERN "rootd.xinetd" EXCLUDE
18	PATTERN "proofd.xinetd" EXCLUDE
19	PATTERN "root.mimes" EXCLUDE
20	- PATTERN "cmake" EXCLUDE
21	- PATTERN "http" EXCLUDE )
22	+ PATTERN "cmake" EXCLUDE )
23	install(DIRECTORY fonts/ DESTINATION ${CMAKE_INSTALL_FONTDIR})
24	install(DIRECTORY icons/ DESTINATION ${CMAKE_INSTALL_ICONDIR})
25	install(DIRECTORY macros/ DESTINATION ${CMAKE_INSTALL_MACRODIR})
26	--
27	2.18.0
28

Lines 1-27 Link Here

(-)a/sci-physics/root/files/rootd.initd (-27 lines)
1	#!/sbin/openrc-run
2	# Copyright 1999-2012 Gentoo Foundation
3	# Distributed under the terms of the GNU General Public License v2
4
5	depend() {
6	need net
7	use logger
8	provide root-file-server
9	}
10
11	start() {
12	ebegin "Starting ROOT file server"
13	pid=$(start-stop-daemon --start --quiet --user ${ROOTD_USER} \
14	--pidfile /var/run/rootd.pid \
15	--exec /usr/bin/rootd -- ${ROOTD_OPTS})
16	retval=$?
17	echo ${ROOTD_PID} > /var/run/rootd.pid
18	eend ${retval}
19	}
20
21	stop() {
22	ebegin "Stopping ROOT file server"
23	start-stop-daemon --stop --quiet \
24	--pidfile /var/run/rootd.pid \
25	--exec /usr/bin/rootd
26	eend $?
27	}