From d9d5870bff725688f7a01e009ae8d319e1ffb506 Mon Sep 17 00:00:00 2001 From: Ken Rice Date: Fri, 20 Nov 2015 14:54:13 -0600 Subject: [PATCH] Revert "FS-8369 Debian8/CentOS7 systemd installer additions" This reverts commit adc8f9a119711b26615805f8ea8f7b2d6fe52b61. --- build/Makefile.am | 8 ----- build/freeswitch-tmpfiles.conf | 1 + build/freeswitch.service | 17 ++++++++++ configure.ac | 28 --------------- init/freeswitch.default | 2 -- init/freeswitch.service.in | 31 ----------------- init/freeswitch.tmpfile | 1 - init/install_systemd.sh.in | 62 ---------------------------------- 8 files changed, 18 insertions(+), 132 deletions(-) create mode 100644 build/freeswitch-tmpfiles.conf create mode 100644 build/freeswitch.service delete mode 100644 init/freeswitch.default delete mode 100644 init/freeswitch.service.in delete mode 100644 init/freeswitch.tmpfile delete mode 100644 init/install_systemd.sh.in diff --git a/build/Makefile.am b/build/Makefile.am index 38202826da..61ac412d42 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -1,6 +1,5 @@ MK=`echo $(MAKE) | $(AWK) '{printf "%5s\n", $$0}' ` - all: @echo " +---------- FreeSWITCH Build Complete ----------+" @echo " + FreeSWITCH has been successfully built. +" @@ -55,13 +54,6 @@ install: @echo " + Install/Re-install default config: +" @echo " + ---------------------------------- +" @echo " + $(MK) samples +" -if KNOWN_INIT - @echo " + +" - @echo " + Install init scripts: +" - @echo " + --------------------- +" - @echo " + +" - @echo " + init/install_systemd.sh +" -endif @echo " + +" @echo " + +" @echo " + Additional resources: +" diff --git a/build/freeswitch-tmpfiles.conf b/build/freeswitch-tmpfiles.conf new file mode 100644 index 0000000000..881873fb29 --- /dev/null +++ b/build/freeswitch-tmpfiles.conf @@ -0,0 +1 @@ +d /run/freeswitch 0750 freeswitch daemon - diff --git a/build/freeswitch.service b/build/freeswitch.service new file mode 100644 index 0000000000..ae6921b4df --- /dev/null +++ b/build/freeswitch.service @@ -0,0 +1,17 @@ +[Unit] +Description=FreeSWITCH +After=syslog.target network.target +After=postgresql.service postgresql-9.3.service postgresql-9.4.service mysqld.service httpd.service + +[Service] +User=freeswitch +EnvironmentFile=-/etc/sysconfig/freeswitch +# RuntimeDirectory is not yet supported in CentOS 7. A workaround is to use /etc/tmpfiles.d/freeswitch.conf +#RuntimeDirectory=/run/freeswitch +#RuntimeDirectoryMode=0750 +WorkingDirectory=/run/freeswitch +ExecStart=/usr/bin/freeswitch -nc -nf $FREESWITCH_PARAMS +ExecReload=/usr/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/configure.ac b/configure.ac index df050a0001..10d13898b0 100644 --- a/configure.ac +++ b/configure.ac @@ -83,8 +83,6 @@ default_certsdir="$prefix/certs" default_fontsdir="$prefix/fonts" default_imagesdir="$prefix/images" -bindir="$exec_prefix/bin" - if test "${enable_fhs}" = "yes"; then eval full_datadir="${datadir}/freeswitch" eval datadir=$full_datadir @@ -773,32 +771,6 @@ case "$host" in ;; *linux*) APR_ADDTO([PLATFORM_CORE_LIBS], [-ldl -lcrypt -lrt]) - if test -f /etc/os-release; then - DISTRO="$(source /etc/os-release && echo $ID$VERSION_ID)" - case "$DISTRO" in - *debian8*) - environmentfilelocation="default" - ;;& - *centos7*) - environmentfilelocation="sysconfig" - ;;& - *debian8*|*centos7*) - knowninit=false - if test -d /run/systemd/system; then - knowninit=true - AC_SUBST(DISTRO) - AC_SUBST(rundir) - AC_SUBST(environmentfilelocation) - AC_CONFIG_FILES([init/install_systemd.sh], [chmod +x init/install_systemd.sh]) - AC_CONFIG_FILES([init/freeswitch.service]) - fi - ;; - *) - knowninit=false - ;; - esac - fi - AM_CONDITIONAL([KNOWN_INIT], [test x$knowninit = xtrue]) ;; esac diff --git a/init/freeswitch.default b/init/freeswitch.default deleted file mode 100644 index 41cd0758c6..0000000000 --- a/init/freeswitch.default +++ /dev/null @@ -1,2 +0,0 @@ -# /etc/default/freeswitch -DAEMON_OPTS="-nonat" diff --git a/init/freeswitch.service.in b/init/freeswitch.service.in deleted file mode 100644 index 930c8c2b93..0000000000 --- a/init/freeswitch.service.in +++ /dev/null @@ -1,31 +0,0 @@ -[Unit] -Description=freeswitch -After=syslog.target network.target local-fs.target - -[Service] -; service -Type=forking -PIDFile=@rundir@/freeswitch.pid -PermissionsStartOnly=true -Environment="DAEMON_OPTS=-nonat" -EnvironmentFile=-/etc/@environmentfilelocation@/freeswitch -ExecStart=@bindir@/freeswitch -u freeswitch -g freeswitch -ncwait -rp ${DAEMON_OPTS} -TimeoutSec=20s -Restart=on-failure -; exec -User=root -Group=daemon -LimitCORE=infinity -LimitNOFILE=100000 -LimitNPROC=60000 -;LimitSTACK=240 -LimitRTPRIO=infinity -LimitRTTIME=7000000 -IOSchedulingClass=realtime -IOSchedulingPriority=2 -CPUSchedulingPolicy=rr -CPUSchedulingPriority=89 -UMask=0007 - -[Install] -WantedBy=multi-user.target diff --git a/init/freeswitch.tmpfile b/init/freeswitch.tmpfile deleted file mode 100644 index baea7b8113..0000000000 --- a/init/freeswitch.tmpfile +++ /dev/null @@ -1 +0,0 @@ -d /var/run/freeswitch 0755 freeswitch freeswitch - - diff --git a/init/install_systemd.sh.in b/init/install_systemd.sh.in deleted file mode 100644 index 60253a141a..0000000000 --- a/init/install_systemd.sh.in +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash -# @DISTRO@ installer -# Niek Vlessert - -USER=`whoami` -DISTRO=@DISTRO@ -if [ $USER != "root" ] ; then - SUDO=`which sudo | awk -F"/" '{print $NF}'` - if [ -z $SUDO ] ; then - echo "No root and no sudo... please run this as root or install sudo and make sure your user has permissions to use it." - exit - else - read -p "The currently active user is not root but sudo is available... do you want to install using sudo? (y/n) " -n 1 -r - if ! [[ $REPLY =~ ^[yY]$ ]] - then - echo - exit - fi - fi -fi - -echo -echo "This will do several things on your @DISTRO@ installation:" -echo "- Create user freeswitch and add it to group freeswitch" -FSPATH=@prefix@ -if [[ $FSPATH == *"freeswitch"* ]] -then - echo "- Set permissions on @prefix@ and files in @bindir@" -fi -echo "- Install systemd unit file" -echo "- Install /etc/@environmentfilelocation@/freeswitch" -echo -read -p "Do you want to continue? (y/n) " -n 1 -r -if [[ $REPLY =~ ^[yY]$ ]] -then - echo - echo "Installing..." - $SUDO groupadd freeswitch - if DISTRO="debian8"; then - $SUDO adduser --disabled-password --quiet --system --home @confdir@ --gecos "FreeSWITCH open source softswitch" --ingroup freeswitch freeswitch - elif DISTRO="centos7"; then - $SUDO adduser --system --home @confdir@ -c "FreeSWITCH open source softswitch" -g freeswitch freeswitch - fi - if [[ $FSPATH == *"freeswitch"* ]] - then - $SUDO chown -R freeswitch:freeswitch @prefix@ - $SUDO chmod -R ug=rwX,o= @prefix@ - $SUDO chmod -R u=rwx,g=rx @bindir@/* - fi - $SUDO cp init/freeswitch.service /etc/systemd/system/ - $SUDO cp init/freeswitch.tmpfile /etc/tmpfiles.d/freeswitch.conf - $SUDO cp init/freeswitch.default /etc/@environmentfilelocation@/freeswitch - $SUDO systemd-tmpfiles --clean --create - $SUDO systemctl daemon-reload - echo - if [ -f @confdir@/vars.xml ] ; then - echo "You may now start Freeswitch using 'systemctl start freeswitch'" - else - echo "Make sure your config files are in place in @confdir@, if they are you can start Freeswitch using 'systemctl start freeswitch'" - fi - echo "Then start fs_cli by running @bindir@/fs_cli" -fi