<p> Attention is currently required from: Jaco Kroon. </p>
<p>Mark Petersen would like Jaco Kroon to <strong>review</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15309">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/systemd: Added note on common issues with systemd and asterisk<br><br>With newer version of linux /var/run/ is a symlink to /run/ that has<br>been turned into tmpfs.<br><br>Added note that if asterisk has to bind to a specific IP that<br>systemd has to wait until the network is up.<br><br>Added note on how to make sure that the environment variable<br>HOSTNAME is included.<br><br>ASTERISK-29216<br>Reported by: Mark Petersen<br>Tested by: Mark Petersen<br><br>Change-Id: Ib3e560655befd3e99eec743687144f5569533379<br>---<br>M configure<br>M configure.ac<br>M contrib/systemd/asterisk.service<br>3 files changed, 19 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/09/15309/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index cd3c7c1..9b96fde 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -1043,6 +1043,7 @@</span><br><span> MISDN_DIR</span><br><span> MISDN_INCLUDE</span><br><span> MISDN_LIB</span><br><span style="color: hsl(120, 100%, 40%);">+LUA_VERSIONS</span><br><span> PBX_LUA</span><br><span> LUA_DIR</span><br><span> LUA_INCLUDE</span><br><span>@@ -1469,6 +1470,7 @@</span><br><span> CXXCPP</span><br><span> JANSSON_CONFIGURE_OPTS</span><br><span> PJPROJECT_CONFIGURE_OPTS</span><br><span style="color: hsl(120, 100%, 40%);">+LUA_VERSIONS</span><br><span> PKG_CONFIG</span><br><span> PKG_CONFIG_PATH</span><br><span> PKG_CONFIG_LIBDIR</span><br><span>@@ -2227,6 +2229,8 @@</span><br><span> Additional configure options to pass to bundled jansson</span><br><span> PJPROJECT_CONFIGURE_OPTS</span><br><span> Additional configure options to pass to bundled pjproject</span><br><span style="color: hsl(120, 100%, 40%);">+ LUA_VERSIONS</span><br><span style="color: hsl(120, 100%, 40%);">+ A space separated list of target lua versions to test.</span><br><span> PKG_CONFIG path to pkg-config utility</span><br><span> PKG_CONFIG_PATH</span><br><span> directories to add to pkg-config's search path</span><br><span>@@ -29515,7 +29519,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-for ver in 5.4 5.3 5.2 5.1; do</span><br><span style="color: hsl(120, 100%, 40%);">+for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do</span><br><span> </span><br><span> if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then</span><br><span> pbxlibdir=""</span><br><span>@@ -29626,6 +29630,7 @@</span><br><span> done</span><br><span> </span><br><span> # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${LUA_VERSIONS}" = "x"; then</span><br><span> </span><br><span> if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then</span><br><span> pbxlibdir=""</span><br><span>@@ -29722,6 +29727,7 @@</span><br><span> fi</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> # Accept either RADIUS client library, their APIs are fully compatible,</span><br><span> # just different header filenames and different SONAMEs</span><br><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 62d02ec..03e141d 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -511,6 +511,7 @@</span><br><span> AST_EXT_LIB_SETUP([LIBXSLT], [LibXSLT], [libxslt])</span><br><span> AST_EXT_LIB_SETUP_OPTIONAL([LIBXSLT_CLEANUP], [LibXSLT Library Cleanup Function], [LIBXSLT], [libxslt])</span><br><span> AST_EXT_LIB_SETUP([LUA], [Lua], [lua])</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_VAR([LUA_VERSIONS],[A space separated list of target lua versions to test.])</span><br><span> AST_EXT_LIB_SETUP([MISDN], [mISDN user], [misdn])</span><br><span> AST_EXT_LIB_SETUP([MYSQLCLIENT], [MySQL client], [mysqlclient])</span><br><span> AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [nbs])</span><br><span>@@ -2555,7 +2556,7 @@</span><br><span> fi</span><br><span> AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-for ver in 5.4 5.3 5.2 5.1; do</span><br><span style="color: hsl(120, 100%, 40%);">+for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do</span><br><span> AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])</span><br><span> if test "x${PBX_LUA}" = "x1" ; then</span><br><span> if test x"${LUA_DIR}" = x; then</span><br><span>@@ -2568,7 +2569,9 @@</span><br><span> done</span><br><span> </span><br><span> # Some distributions (like openSUSE and NetBSD) remove the 5.x suffix.</span><br><span style="color: hsl(0, 100%, 40%);">-AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])</span><br><span style="color: hsl(120, 100%, 40%);">+if test "x${LUA_VERSIONS}" = "x"; then</span><br><span style="color: hsl(120, 100%, 40%);">+ AST_EXT_LIB_CHECK([LUA], [lua], [luaL_newstate], [lua.h], [-lm])</span><br><span style="color: hsl(120, 100%, 40%);">+fi</span><br><span> </span><br><span> # Accept either RADIUS client library, their APIs are fully compatible,</span><br><span> # just different header filenames and different SONAMEs</span><br><span>diff --git a/contrib/systemd/asterisk.service b/contrib/systemd/asterisk.service</span><br><span>index c3d4648..e654f50 100644</span><br><span>--- a/contrib/systemd/asterisk.service</span><br><span>+++ b/contrib/systemd/asterisk.service</span><br><span>@@ -1,15 +1,22 @@</span><br><span> [Unit]</span><br><span> Description=Asterisk PBX and telephony daemon.</span><br><span> After=network.target</span><br><span style="color: hsl(120, 100%, 40%);">+#include these if asterisk need to bind to a specific IP (other than 0.0.0.0)</span><br><span style="color: hsl(120, 100%, 40%);">+#Wants=network-online.target</span><br><span style="color: hsl(120, 100%, 40%);">+#After=network-online.target network.target</span><br><span> </span><br><span> [Service]</span><br><span> Type=notify</span><br><span> Environment=HOME=/var/lib/asterisk</span><br><span style="color: hsl(120, 100%, 40%);">+#if systemd do not provide hostname and you need to use ${ENV(HOSTNAME)}</span><br><span style="color: hsl(120, 100%, 40%);">+#Environment=HOSTNAME=%H</span><br><span> WorkingDirectory=/var/lib/asterisk</span><br><span> User=asterisk</span><br><span> Group=asterisk</span><br><span> ExecStart=/usr/sbin/asterisk -mqf -C /etc/asterisk/asterisk.conf</span><br><span> ExecReload=/usr/sbin/asterisk -rx 'core reload'</span><br><span style="color: hsl(120, 100%, 40%);">+#if /var/run is a tmpfs, this will create /var/run/asterisk on start</span><br><span style="color: hsl(120, 100%, 40%);">+#RuntimeDirectory=asterisk</span><br><span> </span><br><span> #Nice=0</span><br><span> #UMask=0002</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15309">change 15309</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/15309"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: Ib3e560655befd3e99eec743687144f5569533379 </div>
<div style="display:none"> Gerrit-Change-Number: 15309 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Mark Petersen <bugs.digium.com@zombie.dk> </div>
<div style="display:none"> Gerrit-Reviewer: Jaco Kroon <jaco@uls.co.za> </div>
<div style="display:none"> Gerrit-Attention: Jaco Kroon <jaco@uls.co.za> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>