IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-21 16:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Build: don't remove grafana-server and grafana-cli binaries from deb and rpm packages (#59890)

Browse Source 
* don't remove grafana-server and grafana-cli binaries from /usr/share/grafana/bin in deb and rpm packages

* don't add config overrides in /usr/sbin/grafana-server
This commit is contained in:
Dan Cech 2022-12-06 10:36:43 -05:00 committed by GitHub
parent f1fb202284
commit 1dbc22d18b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packaging/wrappers/grafana-server
View File

@ -5,18 +5,8 @@
# the system-wide Grafana configuration that was bundled with the package as we # the system-wide Grafana configuration that was bundled with the package as we
# use the binary. # use the binary.
DEFAULT=/etc/default/grafana
GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}" GRAFANA_HOME="${GRAFANA_HOME:-/usr/share/grafana}"
CONF_DIR=/etc/grafana
DATA_DIR=/var/lib/grafana
PLUGINS_DIR=/var/lib/grafana/plugins
LOG_DIR=/var/log/grafana
CONF_FILE=$CONF_DIR/grafana.ini
PROVISIONING_CFG_DIR=$CONF_DIR/provisioning
EXECUTABLE="$GRAFANA_HOME/bin/grafana" EXECUTABLE="$GRAFANA_HOME/bin/grafana"
if [ ! -x $EXECUTABLE ]; then if [ ! -x $EXECUTABLE ]; then
@ -24,18 +14,6 @@ if [ ! -x $EXECUTABLE ]; then
exit 5 exit 5
fi fi
# overwrite settings from default file
if [ -f "$DEFAULT" ]; then
. "$DEFAULT"
fi
OPTS="--homepath=${GRAFANA_HOME} \
--config=${CONF_FILE} \
--configOverrides='cfg:default.paths.provisioning=$PROVISIONING_CFG_DIR \
cfg:default.paths.data=${DATA_DIR} \
cfg:default.paths.logs=${LOG_DIR} \
cfg:default.paths.plugins=${PLUGINS_DIR}'"
CMD=server CMD=server
eval $EXECUTABLE "$CMD" "$OPTS" "$@" eval $EXECUTABLE "$CMD" "$@"

12
pkg/build/packaging/grafana.go
View File

@ -340,18 +340,6 @@ func createPackage(srcDir string, options linuxPackageOptions) error {
return err return err
} }
// remove unneeded binaries, these are exposed via wrappers that provide the needed configuration
for _, fileName := range []string{
cliBinary,
cliBinary + ".md5",
serverBinary,
serverBinary + ".md5",
} {
if err := os.Remove(filepath.Join(packageRoot, options.homeBinDir, fileName)); err != nil {
return fmt.Errorf("failed to remove %q: %w", filepath.Join(options.homeBinDir, fileName), err)
}
}
if err := executeFPM(options, packageRoot, srcDir); err != nil { if err := executeFPM(options, packageRoot, srcDir); err != nil {
return err return err
} }