mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge branch 'v4.2.x'
This commit is contained in:
commit
0c372f0b85
16
build.go
16
build.go
@ -14,13 +14,13 @@ import (
|
||||
"log"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"runtime"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
"path"
|
||||
)
|
||||
|
||||
var (
|
||||
@ -126,9 +126,9 @@ func makeLatestDistCopies() {
|
||||
log.Fatalf("failed to create latest copies. Cannot read from /dist")
|
||||
}
|
||||
|
||||
latestMapping := map[string]string {
|
||||
".deb": "dist/grafana_latest_amd64.deb",
|
||||
".rpm": "dist/grafana-latest-1.x86_64.rpm",
|
||||
latestMapping := map[string]string{
|
||||
".deb": "dist/grafana_latest_amd64.deb",
|
||||
".rpm": "dist/grafana-latest-1.x86_64.rpm",
|
||||
".tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
|
||||
}
|
||||
|
||||
@ -287,6 +287,14 @@ func createPackage(options linuxPackageOptions) {
|
||||
"-p", "./dist",
|
||||
}
|
||||
|
||||
if options.packageType == "rpm" {
|
||||
args = append(args, "--rpm-posttrans", "packaging/rpm/control/posttrans")
|
||||
}
|
||||
|
||||
if options.packageType == "deb" {
|
||||
args = append(args, "--deb-no-default-config-files")
|
||||
}
|
||||
|
||||
if pkgArch != "" {
|
||||
args = append(args, "-a", pkgArch)
|
||||
}
|
||||
|
7
packaging/rpm/control/postinst
Normal file → Executable file
7
packaging/rpm/control/postinst
Normal file → Executable file
@ -68,13 +68,6 @@ if [ $1 -eq 1 ] ; then
|
||||
echo " sudo service grafana-server start"
|
||||
fi
|
||||
elif [ $1 -ge 2 ] ; then
|
||||
if [ -x /opt/grafana/ ]; then
|
||||
echo "### Upgrading Notice ### "
|
||||
echo "-- New grafana install home is /usr/share/grafana"
|
||||
echo "-- Please move sqlite3 database to /var/lib/grafana/"
|
||||
echo "-- Notice: service name && binary changed to grafana-server"
|
||||
fi
|
||||
|
||||
if [ "$RESTART_ON_UPGRADE" == "true" ]; then
|
||||
stopGrafana
|
||||
startGrafana
|
||||
|
32
packaging/rpm/control/posttrans
Executable file
32
packaging/rpm/control/posttrans
Executable file
@ -0,0 +1,32 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
echo "POSTTRANS: Running script"
|
||||
|
||||
[ -f /etc/sysconfig/grafana-server ] && . /etc/sysconfig/grafana-server
|
||||
|
||||
# copy config files if missing
|
||||
if [ ! -f /etc/grafana/grafana.ini ]; then
|
||||
echo "POSTTRANS: Config file not found"
|
||||
|
||||
if [ -f /etc/grafana/grafana.ini.rpmsave ]; then
|
||||
echo "POSTTRANS: /etc/grafana/grafana.ini.rpmsave config file found."
|
||||
mv /etc/grafana/grafana.ini.rpmsave /etc/grafana/grafana.ini
|
||||
echo "POSTTRANS: /etc/grafana/grafana.ini restored"
|
||||
|
||||
if [ -f /etc/grafana/ldap.toml.rpmsave ]; then
|
||||
echo "POSTTRANS: /etc/grafana/ldap.toml.rpmsave found"
|
||||
mv /etc/grafana/ldap.toml.rpmsave /etc/grafana/ldap.toml
|
||||
echo "POSTTRANS: /etc/grafana/ldap.toml restored"
|
||||
fi
|
||||
|
||||
echo "POSTTRANS: Restoring config file permissions"
|
||||
chown -Rh root:$GRAFANA_GROUP /etc/grafana/*
|
||||
chmod 755 /etc/grafana
|
||||
find /etc/grafana -type f -exec chmod 640 {} ';'
|
||||
find /etc/grafana -type d -exec chmod 755 {} ';'
|
||||
fi
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user