Server: Switch from separate server & cli to a unified grafana binary (#58286)
* avoid the need for a second bulky binary for grafana-cli * look for grafana-server in $PATH as well as same directory * implement unified "grafana" command * update dockerfiles, fix grafana-cli -v * update packaging to work with single binary - add wrapper scripts for grafana and grafana-server - update and sync package files - implement --sign flag of build package command - stop packaging scripts folder, they are not useful for end users - add support for --configOverrides in server command - remove unused nfpm.yaml config file * windows support
This commit is contained in:
@@ -7,23 +7,24 @@ set -e
|
||||
IS_UPGRADE=false
|
||||
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
[ -z "$GRAFANA_USER" ] && GRAFANA_USER="grafana"
|
||||
[ -z "$GRAFANA_GROUP" ] && GRAFANA_GROUP="grafana"
|
||||
if ! getent group "$GRAFANA_GROUP" > /dev/null 2>&1 ; then
|
||||
addgroup --system "$GRAFANA_GROUP" --quiet
|
||||
fi
|
||||
if ! id $GRAFANA_USER > /dev/null 2>&1 ; then
|
||||
adduser --system --home /usr/share/grafana --no-create-home \
|
||||
--ingroup "$GRAFANA_GROUP" --disabled-password --shell /bin/false \
|
||||
"$GRAFANA_USER"
|
||||
fi
|
||||
# Initial installation: $1 == configure
|
||||
# Upgrade: $1 == configure, and $2 not empty
|
||||
if [ "$1" = configure ]; then
|
||||
[ -z "$GRAFANA_USER" ] && GRAFANA_USER="grafana"
|
||||
[ -z "$GRAFANA_GROUP" ] && GRAFANA_GROUP="grafana"
|
||||
if ! getent group "$GRAFANA_GROUP" > /dev/null 2>&1 ; then
|
||||
addgroup --system "$GRAFANA_GROUP" --quiet
|
||||
fi
|
||||
if ! id "$GRAFANA_USER" > /dev/null 2>&1 ; then
|
||||
adduser --system --home /usr/share/grafana --no-create-home \
|
||||
--ingroup "$GRAFANA_GROUP" --disabled-password --shell /bin/false \
|
||||
"$GRAFANA_USER"
|
||||
fi
|
||||
|
||||
# Set user permissions on /var/log/grafana, /var/lib/grafana
|
||||
mkdir -p /var/log/grafana /var/lib/grafana
|
||||
chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
|
||||
chmod 755 /var/log/grafana /var/lib/grafana
|
||||
# Set user permissions on /var/log/grafana, /var/lib/grafana
|
||||
mkdir -p /var/log/grafana /var/lib/grafana
|
||||
chown -R $GRAFANA_USER:$GRAFANA_GROUP /var/log/grafana /var/lib/grafana
|
||||
chmod 755 /var/log/grafana /var/lib/grafana
|
||||
|
||||
# copy user config files
|
||||
if [ ! -f $CONF_FILE ]; then
|
||||
@@ -97,6 +98,5 @@ case "$1" in
|
||||
fi
|
||||
echo " OK"
|
||||
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user