From 756a0d63083d5fbcca3426842db16bc4d06c4a32 Mon Sep 17 00:00:00 2001 From: Sergey Safarov Date: Sat, 30 Sep 2017 05:59:33 -0400 Subject: [PATCH] pkg/kamailio/alpine: Removed custom kamailio.cfg, now used default --- pkg/kamailio/alpine/APKBUILD | 13 +--- pkg/kamailio/alpine/kamailio.cfg | 106 ---------------------------- pkg/kamailio/alpine_docker/build.sh | 1 + 3 files changed, 3 insertions(+), 117 deletions(-) delete mode 100644 pkg/kamailio/alpine/kamailio.cfg diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 44e67b3b325..5a74de5f873 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -8,7 +8,7 @@ pkgrel=0 # If building from a git snapshot, specify the gitcommit # If building a proper release, leave gitcommit blank -_gitcommit=1fe5970917f21e9d69127635e04ba8ae585e2da4 +_gitcommit=c5ffc265cf83c7e329ee8d21c3bafba78b670c58 [ ! -z "${_gitcommit}" ] && pkgver="${pkgver}.$(date +%Y%m%d)" [ ! -z "${_gitcommit}" ] && _suffix="-${_gitcommit:0:7}" @@ -237,7 +237,6 @@ done source="${pkgname}-${pkgver}${_suffix}.tar.gz::https://github.com/kamailio/$pkgname/archive/$_gitcommit.tar.gz 0001-kamdbctl.base.patch 0004-src_core_tcp_read_c.patch - kamailio.cfg kamailio.initd " @@ -281,13 +280,6 @@ package() { cd "$builddir" make FREERADIUS=1 -j1 install || return 1 - # move default config to -doc package and use our own default config - - mv "$pkgdir"/etc/kamailio/kamailio.cfg \ - "$pkgdir"/usr/share/doc/kamailio/ - install -m644 -D "$srcdir"/kamailio.cfg \ - "$pkgdir"/etc/kamailio/kamailio.cfg - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -d -o kamailio "$pkgdir"/var/run/kamailio } @@ -517,8 +509,7 @@ python() { } -sha512sums="6b4c58fe628270f8927721813607ce080b5e257cca8ace8c7b286c77c7880be258c07f1c7fb5711449cfc1f8841468e6ca647cf2e28be7a8d3dbb316527b7198 kamailio-5.1.0.20170922-1fe5970.tar.gz +sha512sums="245411ac2445f4865cd09f56a3cfc4d10a64c9a1be90bfb35cfe80149e845c34c1a867ff661bbd9dac1c48a0416bc577b57ae6133edb69e2a2b43d3a2305ffde kamailio-5.1.0.20170930-c5ffc26.tar.gz 6badfb611c02ffcb4c2e9937731162ea1a4b737f042ed52120e2f96ebb80b5b7d240b5612c9ca565e693eec9b8c52c1ee5db04dfc47d204501021f984b4b11db 0001-kamdbctl.base.patch af8362201957eae6b66baf7368c9ca884024209a396d77c5c52180c9aabe13772e9c6513e59721d39503e5bb7a8c1030f5c10301ea9055bddafb7f01ee2f3076 0004-src_core_tcp_read_c.patch -c1abf69b48847dc8c7ab0d11ef9adb531aa4635f9d44db6933981edc5a47df374664fb24867b19aa64abbcc9777bf1cd0360d9aea54e27b081065928c61e0f0b kamailio.cfg cd6e3b677d803cd78561ad14d9b2589fd35ad0096f48047fdcb4ddc7d9103871357efba3b350946844cb53dbb081210746421fc420c22ac845b90251168a628e kamailio.initd" diff --git a/pkg/kamailio/alpine/kamailio.cfg b/pkg/kamailio/alpine/kamailio.cfg deleted file mode 100644 index 6f91c23492c..00000000000 --- a/pkg/kamailio/alpine/kamailio.cfg +++ /dev/null @@ -1,106 +0,0 @@ -# Sample Kamailio Configuration -# 23 June 2010 - For Alpine Linux -# Accepts all registrations; routes calls to any registered AOR - -#-------------------------------------------------------- -# Section 1: Global Definitions -#-------------------------------------------------------- -debug = 2 -fork = yes -log_stderror = no -# listen = 0.0.0.0 -port = 5060 -children = 4 - -dns = no -rev_dns = no - -mpath = "/usr/lib/kamailio/modules_k/:/usr/lib/kamailio/modules/" - -#-------------------------------------------------------- -# Section 2: Modules -#-------------------------------------------------------- - -loadmodule "tm.so" -loadmodule "sl.so" -loadmodule "tmx.so" -loadmodule "rr.so" -loadmodule "maxfwd.so" -loadmodule "usrloc.so" -loadmodule "registrar.so" -loadmodule "pv.so" -loadmodule "xlog.so" - -#-------------------------------------------------------- -# Section 3: Module Configuration -#-------------------------------------------------------- - -modparam ( "usrloc", "db_mode", 0 ) -modparam ( "rr", "enable_full_lr", 1 ) - - -#-------------------------------------------------------- -# Section 4: Main Route Block -#-------------------------------------------------------- - -route - { - # Uncomment next line if you want to see - # each incoming message - xlog( "L_INFO", "$rm: $fu -> $ru" ); - - if (!mf_process_maxfwd_header("10")) - { - sl_send_reply("483", "Too Many Hops"); - return; - } - - if (msg:len > 4096) - { - sl_send_reply("513", "Message too big" ); - return; - } - - if (method == "REGISTER" ) - { - route(REGISTER); - return; - } - - loose_route(); - - if (!lookup("location")) { - sl_send_reply("404", "User Not Found"); - return; - } - - route(RELAY); - -} -#-------------------------------------------------------- -# Section 5: Secondary Route Blocks -#-------------------------------------------------------- - -# - Default message handler -route[RELAY] { - if (!t_relay()) { - sl_reply_error(); - } -} - -#- Registration Request -route[REGISTER] { - if (!save("location")) { - sl_reply_error(); - } -} - -#-------------------------------------------------------- -# Section 6: Reply Route Block -#-------------------------------------------------------- - - -#-------------------------------------------------------- -# Section 7: Failure Route Block -#-------------------------------------------------------- - diff --git a/pkg/kamailio/alpine_docker/build.sh b/pkg/kamailio/alpine_docker/build.sh index 510325b1991..fad1cd199d0 100755 --- a/pkg/kamailio/alpine_docker/build.sh +++ b/pkg/kamailio/alpine_docker/build.sh @@ -60,6 +60,7 @@ extra_files() { /var /var/run /run +/tmp EOF }