summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mason <ms13sp@gmail.com>2010-03-18 18:26:55 +0000
committerMichael Mason <ms13sp@gmail.com>2010-03-18 18:26:55 +0000
commitab919e61f26ec3409874ebce697842171bfc6d59 (patch)
tree8a0687a0845add5a04f85b0bee4aff4d8b849a08
parentcb0c20d57cec46314cd0cc41cd09c28147636850 (diff)
downloadaports-ab919e61f26ec3409874ebce697842171bfc6d59.tar.bz2
aports-ab919e61f26ec3409874ebce697842171bfc6d59.tar.xz
testing/freeswitch fixes #326. Updated initd and added confd
-rw-r--r--testing/freeswitch/APKBUILD16
-rw-r--r--testing/freeswitch/freeswitch.confd25
-rwxr-xr-x[-rw-r--r--]testing/freeswitch/freeswitch.initd4
-rwxr-xr-xtesting/freeswitch/freeswitch.install15
-rwxr-xr-xtesting/freeswitch/freeswitch.post-install2
-rwxr-xr-xtesting/freeswitch/freeswitch.pre-install1
6 files changed, 38 insertions, 25 deletions
diff --git a/testing/freeswitch/APKBUILD b/testing/freeswitch/APKBUILD
index 3e06f096..7b1a4ea9 100644
--- a/testing/freeswitch/APKBUILD
+++ b/testing/freeswitch/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
pkgname=freeswitch
pkgver=1.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="A communications platform written in C from the ground up"
url="http://www.freeswitch.org"
license="GPL"
@@ -12,6 +12,7 @@ install=
subpackages="$pkgname-dev"
source="http://files.freeswitch.org/freeswitch-$pkgver.tar.gz
modules.conf
+ freeswitch.confd
freeswitch.initd
freeswitch.post-install
freeswitch.pre-install
@@ -50,15 +51,14 @@ build() {
package(){
cd "$srcdir/$pkgname-$pkgver"
make -j1 DESTDIR="$pkgdir" install
-
- # TODO: make and test init.d scripts
- # install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
- # install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+ install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+ install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
md5sums="86e34bdd8cc027d71772cb0dc51388da freeswitch-1.0.4.tar.gz
c05f2356be159e99b3845f5260a33599 modules.conf
-9733f676521006eeeedbc59f44b6e312 freeswitch.initd
-0d06345634fdf4b3f85f6856f3b734f6 freeswitch.post-install
-1ffa906dfcd0afd2af8400c75e45d766 freeswitch.pre-install
+c608cca8ad773acebf201f581438c7e7 freeswitch.confd
+dd3a6535c54fc6ed8399d6bb57d88369 freeswitch.initd
+c0d7ad55063b1f62c9a2fcfa37b2fc0a freeswitch.post-install
+a34305ba1f8a8e7e6dbb9c678cc442b9 freeswitch.pre-install
a7188703019a74fd7f128d165b3ecf42 freeswitch.post-deinstall"
diff --git a/testing/freeswitch/freeswitch.confd b/testing/freeswitch/freeswitch.confd
new file mode 100644
index 00000000..378e4b41
--- /dev/null
+++ b/testing/freeswitch/freeswitch.confd
@@ -0,0 +1,25 @@
+#
+# FreeSWITCH startup configuration
+#
+
+# freeswitch will be running with this userid
+FREESWITCH_USER="freeswitch"
+
+
+# optional: group the freeswitch process should be running with
+#
+# (note: without this option freeswitch will be using all groups
+# the user in FREESWITCH_USER is a member of)
+#
+#FREESWITCH_GROUP="freeswitch"
+
+
+
+# optional: other options, e.g.
+#
+# -hp Use realtime priority and protect freeswitch
+# process from being swapped to disk
+# (warning: dangerous on machines with little ram!)
+#
+#FREESWITCH_OPTS=""
+
diff --git a/testing/freeswitch/freeswitch.initd b/testing/freeswitch/freeswitch.initd
index 6433bb43..84381d77 100644..100755
--- a/testing/freeswitch/freeswitch.initd
+++ b/testing/freeswitch/freeswitch.initd
@@ -20,14 +20,14 @@ start() {
OPTS="${OPTS} ${FREESWITCH_OPTS}"
ebegin "Starting Freeswitch"
- start-stop-daemon --start --quiet --exec /opt/freeswitch/bin/freeswitch \
+ start-stop-daemon --start --quiet --exec /usr/bin/freeswitch \
--pidfile /var/run/freeswitch.pid -- -nc ${OPTS}
eend $?
}
stop() {
ebegin "Stopping Freeswitch"
- start-stop-daemon --stop --quiet --pidfile /opt/freeswitch/log/freeswitch.pid
+ start-stop-daemon --stop --quiet --pidfile /var/run/freeswitch.pid
eend $?
}
diff --git a/testing/freeswitch/freeswitch.install b/testing/freeswitch/freeswitch.install
deleted file mode 100755
index 0507fe53..00000000
--- a/testing/freeswitch/freeswitch.install
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
- pre_install)
- adduser -h /dev/null -s /bin/false -D freeswitch 2>/dev/null
- ;;
- post_install)
- chown -R freeswitch:freeswitch /etc/freeswitch/
- ;;
- post_deinstall)
- deluser freeswitch
- delgroup freeswitch
- ;;
-esac
-
diff --git a/testing/freeswitch/freeswitch.post-install b/testing/freeswitch/freeswitch.post-install
index 2375ada1..3b1c414c 100755
--- a/testing/freeswitch/freeswitch.post-install
+++ b/testing/freeswitch/freeswitch.post-install
@@ -1,3 +1,5 @@
#!/bin/sh
chown -R freeswitch:freeswitch /etc/freeswitch/
+chown -R freeswitch:freeswitch /var/run/freeswitch/
+
diff --git a/testing/freeswitch/freeswitch.pre-install b/testing/freeswitch/freeswitch.pre-install
index 1272bf9c..b8065b52 100755
--- a/testing/freeswitch/freeswitch.pre-install
+++ b/testing/freeswitch/freeswitch.pre-install
@@ -1,3 +1,4 @@
#!/bin/sh
adduser -h /dev/null -s /bin/false -D freeswitch 2>/dev/null
+mkdir /var/run/freeswitch