1 |
commit: 6f479e1a55e376ef959b82b028339444348e79a3 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jul 8 07:50:09 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 8 07:50:09 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f479e1a |
7 |
|
8 |
app-i18n/canna: update init script |
9 |
|
10 |
Gentoo-Bug: 603702 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
app-i18n/canna/canna-3.7_p3-r1.ebuild | 4 +-- |
15 |
app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 +-- |
16 |
app-i18n/canna/files/canna-3.7_p3.initd | 41 ---------------------- |
17 |
.../files/{canna-3.7_p3.confd => canna.confd} | 0 |
18 |
app-i18n/canna/files/canna.initd | 31 ++++++++++++++++ |
19 |
5 files changed, 35 insertions(+), 45 deletions(-) |
20 |
|
21 |
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
22 |
index 2ee6f1090d1..2dac49233f0 100644 |
23 |
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild |
24 |
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild |
25 |
@@ -84,8 +84,8 @@ src_install() { |
26 |
# doins doc/man/guide/tex/canna.{dvi,ps,pdf} |
27 |
#fi |
28 |
|
29 |
- newinitd "${FILESDIR}"/${P}.initd canna || die |
30 |
- newconfd "${FILESDIR}"/${P}.confd canna || die |
31 |
+ newinitd "${FILESDIR}"/${PN}.initd canna || die |
32 |
+ newconfd "${FILESDIR}"/${PN}.confd canna || die |
33 |
insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die |
34 |
keepdir /var/log/canna/ || die |
35 |
|
36 |
|
37 |
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
38 |
index fb7bc151458..6511e2168c8 100644 |
39 |
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild |
40 |
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild |
41 |
@@ -96,8 +96,8 @@ src_install() { |
42 |
doins doc/man/guide/tex/canna.{dvi,ps,pdf} |
43 |
fi |
44 |
|
45 |
- newinitd "${FILESDIR}"/${P}.initd canna || die |
46 |
- newconfd "${FILESDIR}"/${P}.confd canna || die |
47 |
+ newinitd "${FILESDIR}"/${PN}.initd canna || die |
48 |
+ newconfd "${FILESDIR}"/${PN}.confd canna || die |
49 |
insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die |
50 |
keepdir /var/log/canna/ || die |
51 |
|
52 |
|
53 |
diff --git a/app-i18n/canna/files/canna-3.7_p3.initd b/app-i18n/canna/files/canna-3.7_p3.initd |
54 |
deleted file mode 100644 |
55 |
index 9e21b061368..00000000000 |
56 |
--- a/app-i18n/canna/files/canna-3.7_p3.initd |
57 |
+++ /dev/null |
58 |
@@ -1,41 +0,0 @@ |
59 |
-#!/sbin/openrc-run |
60 |
-# Copyright 1999-2009 Gentoo Foundation |
61 |
-# Distributed under the terms of the GNU General Public License v2 |
62 |
- |
63 |
-# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna |
64 |
-CANNASERVER_LOGFILE="/var/log/canna/CANNA0msgs" |
65 |
- |
66 |
-depend() { |
67 |
- after logger |
68 |
-} |
69 |
- |
70 |
-start() { |
71 |
- if [ -S /tmp/.iroha_unix/IROHA ] ; then |
72 |
- /usr/sbin/cannakill >/dev/null 2>&1 |
73 |
- fi |
74 |
- rm -f /tmp/.iroha_unix/IROHA |
75 |
- |
76 |
- if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ] ; then |
77 |
- CANNASERVER_OPTS="${CANNASERVER_OPTS} -syslog" |
78 |
- else |
79 |
- touch "${CANNASERVER_LOGFILE}" |
80 |
- chmod u+w "${CANNASERVER_LOGFILEj}" |
81 |
- fi |
82 |
- |
83 |
- if [ ! -z "${CANNASERVER_OWNER}" ] ; then |
84 |
- if [ -f "${CANNASERVER_LOGFILE}" ] ; then |
85 |
- chown "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}" |
86 |
- fi |
87 |
- CANNASERVER_OPTS="${CANNASERVER_OPTS} -u ${CANNASERVER_OWNER}" |
88 |
- fi |
89 |
- |
90 |
- ebegin "Starting canna" |
91 |
- /usr/sbin/cannaserver ${CANNASERVER_OPTS} |
92 |
- eend $? "Failed to start canna" |
93 |
-} |
94 |
- |
95 |
-stop() { |
96 |
- ebegin "Stopping canna" |
97 |
- /usr/sbin/cannakill |
98 |
- eend $? "Failed to stop canna" |
99 |
-} |
100 |
|
101 |
diff --git a/app-i18n/canna/files/canna-3.7_p3.confd b/app-i18n/canna/files/canna.confd |
102 |
similarity index 100% |
103 |
rename from app-i18n/canna/files/canna-3.7_p3.confd |
104 |
rename to app-i18n/canna/files/canna.confd |
105 |
|
106 |
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd |
107 |
new file mode 100644 |
108 |
index 00000000000..97dac733fa9 |
109 |
--- /dev/null |
110 |
+++ b/app-i18n/canna/files/canna.initd |
111 |
@@ -0,0 +1,31 @@ |
112 |
+#!/sbin/openrc-run |
113 |
+# Copyright 1999-2017 Gentoo Foundation |
114 |
+# Distributed under the terms of the GNU General Public License v2 |
115 |
+ |
116 |
+command="/usr/sbin/${RC_SVCNAME}server" |
117 |
+command_args="${CANNASERVER_OPTS}" |
118 |
+ |
119 |
+# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna |
120 |
+CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs" |
121 |
+ |
122 |
+depend() { |
123 |
+ use logger |
124 |
+ need net |
125 |
+} |
126 |
+ |
127 |
+start_pre() { |
128 |
+ if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then |
129 |
+ command_args="${command_args} -syslog" |
130 |
+ elif [ -z "${CANNASERVER_OWNER}" ]; then |
131 |
+ checkpath "${CANNASERVER_LOGFILE}" |
132 |
+ else |
133 |
+ checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}" |
134 |
+ command_args="${command_args} -u ${CANNASERVER_OWNER}" |
135 |
+ fi |
136 |
+} |
137 |
+ |
138 |
+stop() { |
139 |
+ ebegin "Stopping ${name:-${RC_SVCNAME}}" |
140 |
+ /usr/sbin/${RC_SVCNAME}kill |
141 |
+ eend ${?} |
142 |
+} |