1 |
commit: 246c1cdb477293986857e262bdfba111a86e3ed6 |
2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 29 22:18:35 2017 +0000 |
4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 1 19:46:32 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246c1cdb |
7 |
|
8 |
net-im/ejabberd: Bump version |
9 |
|
10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
11 |
|
12 |
net-im/ejabberd/Manifest | 1 + |
13 |
net-im/ejabberd/ejabberd-17.01.ebuild | 296 +++++++++++++++++++++ |
14 |
.../files/ejabberd-17.01-ejabberdctl.patch | 62 +++++ |
15 |
3 files changed, 359 insertions(+) |
16 |
|
17 |
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest |
18 |
index 786180d6484..c0f2fe3a01a 100644 |
19 |
--- a/net-im/ejabberd/Manifest |
20 |
+++ b/net-im/ejabberd/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST ejabberd-16.04.tar.gz 1715963 SHA256 3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 WHIRLPOOL d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4 |
23 |
DIST ejabberd-16.08.tar.gz 1739542 SHA256 b45598a6f2f1b398a19f23e3280b45eccc833d3339b1aeb6ec08ded7c19b1137 SHA512 661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55 WHIRLPOOL 41f5ae825997818671d6db94ac62108a0b02f8eb6eed07ebaa04287ee2d7955dc4d15c3ce18cbf20240e4b2a14d48ccb8bf383b510851be12326131c4c829788 |
24 |
DIST ejabberd-16.09.tar.gz 1687485 SHA256 7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f WHIRLPOOL 6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2 |
25 |
+DIST ejabberd-17.01.tar.gz 1638418 SHA256 7efa8f25fe01bce876f9379ba7b4f49752a0fddc6a78e5ae82196fdc7f70c90b SHA512 d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566 WHIRLPOOL 7b670b087cccc6b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb |
26 |
|
27 |
diff --git a/net-im/ejabberd/ejabberd-17.01.ebuild b/net-im/ejabberd/ejabberd-17.01.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..ad8edb6a765 |
30 |
--- /dev/null |
31 |
+++ b/net-im/ejabberd/ejabberd-17.01.ebuild |
32 |
@@ -0,0 +1,296 @@ |
33 |
+# Copyright 1999-2017 Gentoo Foundation |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=6 |
37 |
+ |
38 |
+SSL_CERT_MANDATORY=1 |
39 |
+ |
40 |
+inherit eutils pam rebar ssl-cert systemd |
41 |
+ |
42 |
+DESCRIPTION="Robust, scalable and extensible XMPP server" |
43 |
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/" |
44 |
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz |
45 |
+ -> ${P}.tar.gz" |
46 |
+ |
47 |
+LICENSE="GPL-2" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86" |
50 |
+REQUIRED_USE="mssql? ( odbc )" |
51 |
+# TODO: Add 'tools' flag. |
52 |
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis |
53 |
+ riak roster-gw sqlite zlib" |
54 |
+ |
55 |
+RESTRICT="test" |
56 |
+ |
57 |
+# TODO: Add dependencies for 'tools' flag enabled. |
58 |
+# TODO: tools? ( |
59 |
+# TODO: >=dev-erlang/meck-0.8.4 |
60 |
+# TODO: >=dev-erlang/moka-1.0.5b |
61 |
+# TODO: ) |
62 |
+CDEPEND=" |
63 |
+ >=dev-erlang/cache_tab-1.0.6 |
64 |
+ >=dev-erlang/esip-1.0.10 |
65 |
+ >=dev-erlang/fast_tls-1.0.10 |
66 |
+ >=dev-erlang/fast_xml-1.1.19 |
67 |
+ >=dev-erlang/fast_yaml-1.0.8 |
68 |
+ >=dev-erlang/jiffy-0.14.8 |
69 |
+ >=dev-erlang/lager-3.2.1 |
70 |
+ >=dev-erlang/luerl-0.2 |
71 |
+ >=dev-erlang/p1_oauth2-0.6.1 |
72 |
+ >=dev-erlang/p1_utils-1.0.6 |
73 |
+ >=dev-erlang/stringprep-1.0.7 |
74 |
+ >=dev-erlang/stun-1.0.9 |
75 |
+ >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] |
76 |
+ >=net-im/jabber-base-0.01 |
77 |
+ ldap? ( =net-nds/openldap-2* ) |
78 |
+ mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) |
79 |
+ nls? ( >=dev-erlang/iconv-1.0.3 ) |
80 |
+ odbc? ( dev-db/unixODBC ) |
81 |
+ pam? ( >=dev-erlang/p1_pam-1.0.0 ) |
82 |
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.2 ) |
83 |
+ redis? ( >=dev-erlang/eredis-1.0.8 ) |
84 |
+ riak? ( |
85 |
+ >=dev-erlang/hamcrest-0.1.0_p20150103 |
86 |
+ >=dev-erlang/riakc-2.4.1 |
87 |
+ ) |
88 |
+ sqlite? ( >=dev-erlang/sqlite3-1.1.5 ) |
89 |
+ zlib? ( >=dev-erlang/ezlib-1.0.2 )" |
90 |
+DEPEND="${CDEPEND} |
91 |
+ >=sys-apps/gawk-4.1" |
92 |
+RDEPEND="${CDEPEND} |
93 |
+ captcha? ( media-gfx/imagemagick[truetype,png] )" |
94 |
+ |
95 |
+DOCS=( README ) |
96 |
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" ) |
97 |
+ |
98 |
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem" |
99 |
+# Paths in net-im/jabber-base |
100 |
+JABBER_ETC="${EPREFIX}/etc/jabber" |
101 |
+JABBER_LOG="${EPREFIX}/var/log/jabber" |
102 |
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber" |
103 |
+ |
104 |
+# Adjust example configuration file to Gentoo. |
105 |
+# - Use our sample certificates. |
106 |
+# - Correct PAM service name. |
107 |
+adjust_config() { |
108 |
+ sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \ |
109 |
+ -e "s|\"pamservicename\"|\"xmpp\"|" \ |
110 |
+ -i "${S}/ejabberd.yml.example" \ |
111 |
+ || die 'failed to adjust example config' |
112 |
+} |
113 |
+ |
114 |
+# Set paths to ejabberd lib directory consistently to point always to directory |
115 |
+# suffixed with version. |
116 |
+correct_ejabberd_paths() { |
117 |
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ |
118 |
+ -i "${S}/Makefile.in" \ |
119 |
+ || die 'failed to set ejabberd path in Makefile.in' |
120 |
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ |
121 |
+ -i "${S}/ejabberdctl.template" \ |
122 |
+ || die 'failed to set ejabberd path in ejabberdctl.template' |
123 |
+ sed -e 's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|' \ |
124 |
+ -i "${S}/ejabberd.yml.example" \ |
125 |
+ || die 'failed to correct path to captcha.sh in example config' |
126 |
+} |
127 |
+ |
128 |
+# Get epam-wrapper from 'files' directory and correct path to lib directory in |
129 |
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper |
130 |
+# file exists there already. |
131 |
+customize_epam_wrapper() { |
132 |
+ local epam_wrapper_src="$1" |
133 |
+ local epam_wrapper_dst="${S}/epam-wrapper" |
134 |
+ |
135 |
+ [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' |
136 |
+ sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ |
137 |
+ "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ |
138 |
+ || die 'failed to install epam-wrapper' |
139 |
+} |
140 |
+ |
141 |
+# Check if there already exists a certificate. |
142 |
+ejabberd_cert_exists() { |
143 |
+ local cert |
144 |
+ |
145 |
+ for cert in $(gawk -- \ |
146 |
+ 'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m) {print m[1];}' \ |
147 |
+ "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do |
148 |
+ [[ -f ${cert} ]] && return 0 |
149 |
+ done |
150 |
+ |
151 |
+ return 1 |
152 |
+} |
153 |
+ |
154 |
+# Generate and install sample ejabberd certificate. It's installed into |
155 |
+# EJABBERD_CERT path. |
156 |
+ejabberd_cert_install() { |
157 |
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}" |
158 |
+ install_cert "${EJABBERD_CERT%.*}" |
159 |
+ chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die |
160 |
+ chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die |
161 |
+} |
162 |
+ |
163 |
+# Get path to ejabberd lib directory. |
164 |
+# |
165 |
+# This is the path ./configure script Base for this path is path set in |
166 |
+# ./configure script which is /usr/lib by default. If libdir is explicitely set |
167 |
+# to something else than this should be adjusted here as well. |
168 |
+get_ejabberd_path() { |
169 |
+ echo "/usr/$(get_libdir)/${P}" |
170 |
+} |
171 |
+ |
172 |
+# Make ejabberd.service for systemd from upstream provided template. |
173 |
+make_ejabberd_service() { |
174 |
+ sed -r \ |
175 |
+ -e 's!@ctlscriptpath@!/usr/sbin!' \ |
176 |
+ -e 's!(User|Group)=(.*)!\1=jabber!' \ |
177 |
+ "${PN}.service.template" >"${PN}.service" \ |
178 |
+ || die 'failed to make ejabberd.service' |
179 |
+} |
180 |
+ |
181 |
+# Set paths to defined by net-im/jabber-base. |
182 |
+set_jabberbase_paths() { |
183 |
+ sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ |
184 |
+ -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ |
185 |
+ -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \ |
186 |
+ -i "${S}/Makefile.in" \ |
187 |
+ || die 'failed to set paths in Makefile.in' |
188 |
+ sed -e "s|\(ETC_DIR=\){{sysconfdir}}.*|\1${JABBER_ETC}|" \ |
189 |
+ -e "s|\(LOGS_DIR=\){{localstatedir}}.*|\1${JABBER_LOG}|" \ |
190 |
+ -e "s|\(SPOOL_DIR=\){{localstatedir}}.*|\1${JABBER_SPOOL}|" \ |
191 |
+ -i "${S}/ejabberdctl.template" \ |
192 |
+ || die 'failed to set paths ejabberdctl.template' |
193 |
+} |
194 |
+ |
195 |
+# Skip installing docs because it's only COPYING that's installed by Makefile. |
196 |
+skip_docs() { |
197 |
+ gawk -i inplace ' |
198 |
+/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ { |
199 |
+ if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) { |
200 |
+ print $0; |
201 |
+ } else { |
202 |
+ next; |
203 |
+ } |
204 |
+} |
205 |
+1 |
206 |
+' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in' |
207 |
+} |
208 |
+ |
209 |
+src_prepare() { |
210 |
+ default |
211 |
+ |
212 |
+ rebar_remove_deps |
213 |
+ correct_ejabberd_paths |
214 |
+ set_jabberbase_paths |
215 |
+ make_ejabberd_service |
216 |
+ skip_docs |
217 |
+ adjust_config |
218 |
+ customize_epam_wrapper "${FILESDIR}/epam-wrapper" |
219 |
+ |
220 |
+ # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory |
221 |
+ # rather than its parent which is default. That way ejabberd directory |
222 |
+ # takes precedence is module lookup. |
223 |
+ local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" |
224 |
+ sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ |
225 |
+ -i "${S}/ejabberdctl.template" \ |
226 |
+ || die 'failed to set ERL_LIBS in ejabberdctl.template' |
227 |
+} |
228 |
+ |
229 |
+src_configure() { |
230 |
+ econf \ |
231 |
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
232 |
+ --enable-user=jabber \ |
233 |
+ $(use_enable debug) \ |
234 |
+ $(use_enable full-xml) \ |
235 |
+ $(use_enable hipe) \ |
236 |
+ $(use_enable mssql) \ |
237 |
+ $(use_enable mysql) \ |
238 |
+ $(use_enable nls iconv) \ |
239 |
+ $(use_enable odbc) \ |
240 |
+ $(use_enable pam) \ |
241 |
+ $(use_enable postgres pgsql) \ |
242 |
+ $(use_enable redis) \ |
243 |
+ $(use_enable riak) \ |
244 |
+ $(use_enable roster-gw roster-gateway-workaround) \ |
245 |
+ $(use_enable sqlite) \ |
246 |
+ $(use_enable zlib) |
247 |
+} |
248 |
+ |
249 |
+src_compile() { |
250 |
+ emake REBAR='rebar -v' src |
251 |
+} |
252 |
+ |
253 |
+src_install() { |
254 |
+ default |
255 |
+ |
256 |
+ if use pam; then |
257 |
+ local epam_path="$(get_ejabberd_path)/priv/bin/epam" |
258 |
+ |
259 |
+ pamd_mimic_system xmpp auth account || die "cannot create pam.d file" |
260 |
+ into "$(get_ejabberd_path)/priv" |
261 |
+ newbin epam-wrapper epam |
262 |
+ # PAM helper module permissions |
263 |
+ # https://www.process-one.net/docs/ejabberd/guide_en.html#pam |
264 |
+ fowners root:jabber "${epam_path}" |
265 |
+ fperms 4750 "${epam_path}" |
266 |
+ fi |
267 |
+ |
268 |
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}" |
269 |
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
270 |
+ systemd_dounit "${PN}.service" |
271 |
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" |
272 |
+ |
273 |
+ insinto /etc/logrotate.d |
274 |
+ newins "${FILESDIR}/${PN}.logrotate" "${PN}" |
275 |
+} |
276 |
+ |
277 |
+pkg_postinst() { |
278 |
+ if [[ ! ${REPLACING_VERSIONS} ]]; then |
279 |
+ echo |
280 |
+ elog "For configuration instructions, please see" |
281 |
+ elog " http://www.process-one.net/en/ejabberd/docs/" |
282 |
+ echo |
283 |
+ if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then |
284 |
+ ewarn "If you have used pubsub in ejabberd-2.* you may encounter issues after" |
285 |
+ ewarn "migration to ${PV}. pubsub data may not be migrated automatically and" |
286 |
+ ewarn "you may need to run migration script manually, see:" |
287 |
+ ewarn |
288 |
+ ewarn " https://github.com/processone/ejabberd/issues/479#issuecomment-124497456" |
289 |
+ ewarn |
290 |
+ ewarn "In case you don't care about all stored moods, activities, geoinfo and you" |
291 |
+ ewarn "know you don't store in pubsub anything important, you can just remove" |
292 |
+ ewarn "pubsub tables:" |
293 |
+ ewarn |
294 |
+ ewarn " rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*" |
295 |
+ ewarn |
296 |
+ ewarn "See also: https://bugs.gentoo.org/show_bug.cgi?id=588244" |
297 |
+ echo |
298 |
+ fi |
299 |
+ elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then |
300 |
+ elog "Ejabberd now defaults to using a YAML format for its config file." |
301 |
+ elog "The old ejabberd.cfg file can be converted using the following instructions:" |
302 |
+ echo |
303 |
+ elog "1. Make sure all processes related to the previous version of ejabberd aren't" |
304 |
+ elog " running. Usually this just means the ejabberd and epmd daemons and possibly" |
305 |
+ elog " the pam-related process (epam) if pam support is enabled." |
306 |
+ elog "2. Run \`ejabberdctl start\` with sufficient permissions. Note that this can" |
307 |
+ elog " fail to start ejabberd properly for various reasons. Check ejabberd's main" |
308 |
+ elog " log file at /var/log/jabber/ejabberd.log to confirm it started successfully." |
309 |
+ elog "3. Run" |
310 |
+ elog " \`ejabberdctl convert_to_yaml /etc/jabber/ejabberd.cfg /etc/jabber/ejabberd.yml.new\`" |
311 |
+ elog " with sufficient permissions, edit and rename /etc/jabber/ejabberd.yml.new to" |
312 |
+ elog " /etc/jabber/ejabberd.yml, and finally restart ejabberd with the new config" |
313 |
+ elog " file." |
314 |
+ echo |
315 |
+ fi |
316 |
+ |
317 |
+ if ! ejabberd_cert_exists; then |
318 |
+ ejabberd_cert_install |
319 |
+ fi |
320 |
+ |
321 |
+ if use pam; then |
322 |
+ # sfperms drops read bit from files with suid. Reapply it. |
323 |
+ # Fix bug #592218. |
324 |
+ local epam_path="$(get_ejabberd_path)/priv/bin/epam" |
325 |
+ chmod g+r "${EROOT%/}${epam_path}" \ |
326 |
+ || die "failed to correct ${epam_path} permissions" |
327 |
+ fi |
328 |
+} |
329 |
|
330 |
diff --git a/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch b/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch |
331 |
new file mode 100644 |
332 |
index 00000000000..6001c651f5d |
333 |
--- /dev/null |
334 |
+++ b/net-im/ejabberd/files/ejabberd-17.01-ejabberdctl.patch |
335 |
@@ -0,0 +1,62 @@ |
336 |
+From 185923a3c5f11c2d29599416a52b6594bc94d8c9 Mon Sep 17 00:00:00 2001 |
337 |
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@×××××××.name> |
338 |
+Date: Mon, 29 Aug 2016 22:29:41 +0100 |
339 |
+Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup |
340 |
+ |
341 |
+Set SHELL since the generic jabber user used on Gentoo for jabber |
342 |
+servers doesn't have a valid shell set by default and fix EXEC_CMD |
343 |
+otherwise it fails with "This account is currently not available" again |
344 |
+due to jabber not having a valid shell. |
345 |
+ |
346 |
+Also, workaround the assumption that jabber's $HOME is a directory when |
347 |
+instead it defaults to /dev/null on Gentoo. |
348 |
+--- |
349 |
+ ejabberdctl.template | 8 ++++++-- |
350 |
+ 1 file changed, 6 insertions(+), 2 deletions(-) |
351 |
+ |
352 |
+diff --git a/ejabberdctl.template b/ejabberdctl.template |
353 |
+index 5b34ebe..3c080fd 100755 |
354 |
+--- a/ejabberdctl.template |
355 |
++++ b/ejabberdctl.template |
356 |
+@@ -16,6 +16,7 @@ IEX={{bindir}}/iex |
357 |
+ EPMD={{epmd}} |
358 |
+ INSTALLUSER={{installuser}} |
359 |
+ ERL_LIBS={{libdir}} |
360 |
++SHELL=/bin/sh |
361 |
+ |
362 |
+ # check the proper system user is used if defined |
363 |
+ if [ "$INSTALLUSER" != "" ] ; then |
364 |
+@@ -23,11 +24,11 @@ if [ "$INSTALLUSER" != "" ] ; then |
365 |
+ for GID in `id -G`; do |
366 |
+ if [ $GID -eq 0 ] ; then |
367 |
+ INSTALLUSER_HOME=$(getent passwd "$INSTALLUSER" | cut -d: -f6) |
368 |
+- if [ -n "$INSTALLUSER_HOME" ] && [ ! -d "$INSTALLUSER_HOME" ] ; then |
369 |
++ if [ -n "$INSTALLUSER_HOME" ] && [ ! -e "$INSTALLUSER_HOME" ] ; then |
370 |
+ mkdir -p "$INSTALLUSER_HOME" |
371 |
+ chown "$INSTALLUSER" "$INSTALLUSER_HOME" |
372 |
+ fi |
373 |
+- EXEC_CMD="su $INSTALLUSER -c" |
374 |
++ EXEC_CMD="su $INSTALLUSER -p -c" |
375 |
+ fi |
376 |
+ done |
377 |
+ if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then |
378 |
+@@ -91,6 +92,7 @@ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log |
379 |
+ DATETIME=`date "+%Y%m%d-%H%M%S"` |
380 |
+ ERL_CRASH_DUMP=$LOGS_DIR/erl_crash_$DATETIME.dump |
381 |
+ ERL_INETRC=$ETC_DIR/inetrc |
382 |
++HOME=$SPOOL_DIR |
383 |
+ |
384 |
+ # define mnesia options |
385 |
+ MNESIA_OPTS="-mnesia dir \"\\\"$SPOOL_DIR\\\"\" $MNESIA_OPTIONS" |
386 |
+@@ -149,6 +151,8 @@ export ERL_MAX_ETS_TABLES |
387 |
+ export CONTRIB_MODULES_PATH |
388 |
+ export CONTRIB_MODULES_CONF_DIR |
389 |
+ export ERL_LIBS |
390 |
++export HOME |
391 |
++export SHELL |
392 |
+ |
393 |
+ shell_escape_str() |
394 |
+ { |
395 |
+-- |
396 |
+2.9.2 |
397 |
+ |