Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10061 from ynezz/upstream/service-status-fix

Browse source 
treewide: fix service status
This commit is contained in:
Rosen Penev 2019-12-18 16:18:45 -08:00 committed by GitHub
commit 5117ed17f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/postgresql/Makefile
View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql
PKG_VERSION:=11.3
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_LICENSE:=PostgreSQL
PKG_CPE_ID:=cpe:/a:postgresql:postgresql

5
libs/postgresql/files/postgresql.init
View file

@ -6,9 +6,6 @@ PROG=/usr/bin/postmaster
USE_PROCD=1
EXTRA_COMMANDS="status"
EXTRA_HELP=" status Show current status of the PostgreSQL server"
fix_hosts() {
# make sure localhost (without a dot) is in /etc/hosts
grep -q 'localhost$' /etc/hosts || echo '127.0.0.1 localhost' >> /etc/hosts
@ -71,7 +68,7 @@ stop_service() {
/usr/bin/pg_ctl stop -U postgres -D "${pgdata}" -s
}
status() {
status_service() {
config_load "postgresql"
config_get pgdata config PGDATA
/usr/bin/pg_ctl status -U postgres -D "${pgdata}"

2
net/apfree-wifidog/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apfree-wifidog
PKG_VERSION:=3.11.1716
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/liudf0716/apfree_wifidog.git

2
net/apfree-wifidog/files/wifidogx.init
View file

@ -280,6 +280,6 @@ start_service() {
procd_close_instance
}
status() {
status_service() {
/usr/bin/wdctlx status
}

2
net/simple-adblock/Makefile
View file

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock
PKG_VERSION:=1.8.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
PKG_LICENSE:=GPL-3.0-or-later

4
net/simple-adblock/files/simple-adblock.init
View file

@ -1028,9 +1028,9 @@ killcache() {
return 0
}
status() {
status_service() {
local status="$(tmpfs get status)" error="$(tmpfs get error)" message="$(tmpfs get message)"
if [ -n "$status" ] && [ -n "$message" ]; then
if [ -n "$status" ] && [ -n "$message" ]; then
status="${status}: $message"
fi
[ -n "$status" ] && output "$serviceName $status\\n"

2
net/wifidog/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=wifidog
PKG_VERSION:=1.3.0
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/wifidog/wifidog-gateway

2
net/wifidog/files/wifidog.init
View file

@ -17,6 +17,6 @@ start_service() {
procd_close_instance
}
status() {
status_service() {
/usr/bin/wdctl status
}