kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Revert "FS-8369 Debian8/CentOS7 systemd installer additions"

Browse Source 
This reverts commit 757fa94239e67aed08ec8ada776415e08a18987a.
This commit is contained in:
Ken Rice 2015-11-20 14:54:05 -06:00
parent 5ad6a2533a
commit ebba246192
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/Makefile.am
View File

@ -57,10 +57,10 @@ install:
@echo " + $(MK) samples +" @echo " + $(MK) samples +"
if KNOWN_INIT if KNOWN_INIT
@echo " + +" @echo " + +"
@echo " + Install startup scripts: +" @echo " + Install init scripts: +"
@echo " + ------------------------ +" @echo " + --------------------- +"
@echo " + +" @echo " + +"
@echo " + build/startup/install_systemd.sh +" @echo " + init/install_systemd.sh +"
endif endif
@echo " + +" @echo " + +"
@echo " + +" @echo " + +"

7
configure.ac
View File

@ -83,7 +83,7 @@ default_certsdir="$prefix/certs"
default_fontsdir="$prefix/fonts" default_fontsdir="$prefix/fonts"
default_imagesdir="$prefix/images" default_imagesdir="$prefix/images"
eval bindir_expanded="${bindir}" bindir="$exec_prefix/bin"
if test "${enable_fhs}" = "yes"; then if test "${enable_fhs}" = "yes"; then
eval full_datadir="${datadir}/freeswitch" eval full_datadir="${datadir}/freeswitch"
@ -789,9 +789,8 @@ case "$host" in
AC_SUBST(DISTRO) AC_SUBST(DISTRO)
AC_SUBST(rundir) AC_SUBST(rundir)
AC_SUBST(environmentfilelocation) AC_SUBST(environmentfilelocation)
AC_SUBST(bindir_expanded) AC_CONFIG_FILES([init/install_systemd.sh], [chmod +x init/install_systemd.sh])
AC_CONFIG_FILES([build/startup/install_systemd.sh], [chmod +x build/startup/install_systemd.sh]) AC_CONFIG_FILES([init/freeswitch.service])
AC_CONFIG_FILES([build/startup/freeswitch.service])
fi fi
;; ;;
*) *)

0
build/startup/freeswitch.default → init/freeswitch.default
View File

0
build/startup/freeswitch.service.in → init/freeswitch.service.in
View File

0
build/startup/freeswitch.tmpfile → init/freeswitch.tmpfile
View File

8
build/startup/install_systemd.sh.in → init/install_systemd.sh.in
View File

@ -25,11 +25,11 @@ echo "- Create user freeswitch and add it to group freeswitch"
FSPATH=@prefix@ FSPATH=@prefix@
if [[ $FSPATH == *"freeswitch"* ]] if [[ $FSPATH == *"freeswitch"* ]]
then then
echo "- Set permissions on @prefix@ and files in @bindir_expanded@" echo "- Set permissions on @prefix@ and files in @bindir@"
fi fi
echo "- Install systemd unit file" echo "- Install systemd unit file"
echo "- Install /etc/@environmentfilelocation@/freeswitch" echo "- Install /etc/@environmentfilelocation@/freeswitch"
echo echo
read -p "Do you want to continue? (y/n) " -n 1 -r read -p "Do you want to continue? (y/n) " -n 1 -r
if [[ $REPLY =~ ^[yY]$ ]] if [[ $REPLY =~ ^[yY]$ ]]
then then
@ -45,7 +45,7 @@ then
then then
$SUDO chown -R freeswitch:freeswitch @prefix@ $SUDO chown -R freeswitch:freeswitch @prefix@
$SUDO chmod -R ug=rwX,o= @prefix@ $SUDO chmod -R ug=rwX,o= @prefix@
$SUDO chmod -R u=rwx,g=rx @bindir_expanded@/* $SUDO chmod -R u=rwx,g=rx @bindir@/*
fi fi
$SUDO cp init/freeswitch.service /etc/systemd/system/ $SUDO cp init/freeswitch.service /etc/systemd/system/
$SUDO cp init/freeswitch.tmpfile /etc/tmpfiles.d/freeswitch.conf $SUDO cp init/freeswitch.tmpfile /etc/tmpfiles.d/freeswitch.conf
@ -58,5 +58,5 @@ then
else else
echo "Make sure your config files are in place in @confdir@, if they are you can start Freeswitch using 'systemctl start freeswitch'" echo "Make sure your config files are in place in @confdir@, if they are you can start Freeswitch using 'systemctl start freeswitch'"
fi fi
echo "Then start fs_cli by running @bindir_expanded@/fs_cli" echo "Then start fs_cli by running @bindir@/fs_cli"
fi fi