summaryrefslogtreecommitdiffhomepage
path: root/pkg/rpm/rpmbuild
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2018-09-26 15:24:49 +0300
committerAndrei Belov <defan@nginx.com>2018-09-26 15:24:49 +0300
commit446479b3118a1217e359495ac4669931bfed65a9 (patch)
tree72882b073389930f9ab301fc1da36d2449fa13a1 /pkg/rpm/rpmbuild
parent6b8a992bfa32b3d9a7e7bb4b40a2b9ff1d02e05a (diff)
downloadunit-446479b3118a1217e359495ac4669931bfed65a9.tar.gz
unit-446479b3118a1217e359495ac4669931bfed65a9.tar.bz2
Packages: removed "loadconfig" and "saveconfig" actions.
Diffstat (limited to 'pkg/rpm/rpmbuild')
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.init30
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.loadconfig.sh25
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.saveconfig.sh24
3 files changed, 1 insertions, 78 deletions
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.init b/pkg/rpm/rpmbuild/SOURCES/unit.init
index b871ef32..e1aacd81 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.init
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.init
@@ -20,11 +20,6 @@
exec="/usr/sbin/unitd"
prog="unitd"
-config="/etc/unit/unit.conf"
-
-if [ -n "$2" ]; then
- config=$2
-fi
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -86,31 +81,8 @@ case "$1" in
rh_status_q || exit 0
restart
;;
- saveconfig)
- curl -sS --unix-socket /var/run/control.unit.sock localhost >${config}.new
- if [ $? -ne 0 ]; then
- echo "Could not retreive configuration" >&2
- rm -f ${config}.new
- exit 1
- fi
- mv ${config}.new ${config}
- echo "The following configuration has been saved to ${config}:"
- cat ${config}
- ;;
- loadconfig)
- if [ ! -e ${config} ]; then
- echo "Could not find ${config} for loading" >&2
- exit 1
- fi
- echo "Loading configuration from ${config}..."
- curl -sS -X PUT --data-binary @${config} --unix-socket /var/run/control.unit.sock localhost
- if [ $? -ne 0 ]; then
- echo "Loading failed!" >&2
- exit 1
- fi
- ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|saveconfig|loadconfig}"
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
exit 2
esac
exit $?
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.loadconfig.sh b/pkg/rpm/rpmbuild/SOURCES/unit.loadconfig.sh
deleted file mode 100644
index 3dd90740..00000000
--- a/pkg/rpm/rpmbuild/SOURCES/unit.loadconfig.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# Legacy action script for "service unit loadconfig"
-
-CONFIG=/etc/unit/config
-
-if [ -n "$1" ] ; then
- CONFIG=$1
-fi
-
-if [ ! -e ${CONFIG} ]; then
- echo "Could not find ${CONFIG} for loading" >&2
- exit 1
-fi
-
-echo "Loading configuration from ${CONFIG}..."
-
-curl -sS -X PUT --data-binary @${CONFIG} --unix-socket /var/run/control.unit.sock localhost
-
-if [ $? -ne 0 ]; then
- echo "Loading failed!" >&2
- exit 1
-fi
-
-exit 0
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.saveconfig.sh b/pkg/rpm/rpmbuild/SOURCES/unit.saveconfig.sh
deleted file mode 100644
index dbed9a81..00000000
--- a/pkg/rpm/rpmbuild/SOURCES/unit.saveconfig.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# Legacy action script for "service unit saveconfig"
-
-CONFIG=/etc/unit/config
-
-if [ -n "$1" ] ; then
- CONFIG=$1
-fi
-
-curl -sS --unix-socket /var/run/control.unit.sock localhost >${CONFIG}.new
-
-if [ $? -ne 0 ]; then
- echo "Could not retreive configuration" >&2
- rm -f ${CONFIG}.new
- exit 1
-fi
-
-mv ${CONFIG}.new ${CONFIG}
-
-echo "The following configuration has been saved to ${CONFIG}:"
-cat ${CONFIG}
-
-exit 0