Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7308 from jbudz/issues/7275
[build] update install package paths, centralize config
- Loading branch information
Showing
9 changed files
with
215 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/sh | ||
| set -e | ||
|
|
||
| user_check() { | ||
| getent passwd "$1" > /dev/null 2>&1 | ||
| } | ||
|
|
||
| user_create() { | ||
| # Create a system user. A system user is one within the system uid range and | ||
| # has no expiration | ||
| useradd -r "$1" | ||
| } | ||
|
|
||
| if ! user_check "<%= user %>" ; then | ||
| user_create "<%= user %>" | ||
| fi | ||
| chown -R <%= user %>:<%= group %> <%= optimizeDir %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #!/bin/sh | ||
| set -e | ||
|
|
||
| user_check() { | ||
| getent passwd "$1" > /dev/null 2>&1 | ||
| } | ||
|
|
||
| user_remove() { | ||
| userdel "$1" | ||
| } | ||
|
|
||
| REMOVE_USER=false | ||
|
|
||
| case $1 in | ||
| # Includes cases for all valid arguments, exit 1 otherwise | ||
| # Debian | ||
| purge) | ||
| REMOVE_USER=true | ||
| ;; | ||
|
|
||
| remove|failed-upgrade|abort-install|abort-upgrade|disappear|upgrade|disappear) | ||
| ;; | ||
|
|
||
| # Red Hat | ||
| 0) | ||
| REMOVE_USER=true | ||
| ;; | ||
|
|
||
| 1) | ||
| ;; | ||
|
|
||
| *) | ||
| echo "post remove script called with unknown argument \`$1'" >&2 | ||
| exit 1 | ||
| ;; | ||
| esac | ||
|
|
||
| if [ "$REMOVE_USER" = "true" ]; then | ||
| if user_check "<%= user %>" ; then | ||
| user_remove "<%= user %>" | ||
| fi | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/sh | ||
| set -e | ||
|
|
||
| if command -v systemctl >/dev/null && systemctl is-active kibana.service >/dev/null; then | ||
| systemctl --no-reload stop kibana.service | ||
| elif [ -x /etc/init.d/kibana ]; then | ||
| if command -v invoke-rc.d >/dev/null; then | ||
| invoke-rc.d kibana stop | ||
| elif command -v service >/dev/null; then | ||
| service kibana stop | ||
| else | ||
| /etc/init.d/kibana stop | ||
| fi | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/bin/sh | ||
| set -e | ||
|
|
||
| echo -n "Stopping kibana service..." | ||
| if command -v systemctl >/dev/null && systemctl is-active kibana.service >/dev/null; then | ||
| systemctl --no-reload stop kibana.service | ||
| elif [ -x /etc/init.d/kibana ]; then | ||
| if command -v invoke-rc.d >/dev/null; then | ||
| invoke-rc.d kibana stop | ||
| elif command -v service >/dev/null; then | ||
| service kibana stop | ||
| else | ||
| /etc/init.d/kibana stop | ||
| fi | ||
| fi | ||
| echo " OK" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,29 @@ | ||
| module.exports = function createServices(grunt) { | ||
| const { resolve } = require('path'); | ||
| const { appendFileSync } = require('fs'); | ||
| const exec = require('../utils/exec'); | ||
| import { resolve } from 'path'; | ||
| import { appendFileSync } from 'fs'; | ||
| import exec from '../utils/exec'; | ||
|
|
||
| export default (grunt) => { | ||
| const userScriptsDir = grunt.config.get('userScriptsDir'); | ||
| const { path, user, group, name, description } = grunt.config.get('packages'); | ||
|
|
||
| grunt.registerTask('_build:pleaseRun', function () { | ||
| // TODO(sissel): Detect if 'pleaserun' is found, and provide a useful error | ||
| // to the user if it is missing. | ||
|
|
||
| grunt.config.get('services').forEach(function (service) { | ||
| grunt.config.get('services').forEach((service) => { | ||
| grunt.file.mkdir(service.outputDir); | ||
| exec('pleaserun', [ | ||
| '--install', | ||
| '--no-install-actions', | ||
| '--install-prefix', service.outputDir, | ||
| '--overwrite', | ||
| '--user', 'kibana', | ||
| '--group', 'kibana', | ||
| '--sysv-log-path', '/var/log/kibana/', | ||
| '--name', name, | ||
| '--description', description, | ||
| '--user', user, | ||
| '--group', group, | ||
| '--sysv-log-path', path.logs, | ||
| '-p', service.name, | ||
| '-v', service.version, | ||
| '/opt/kibana/bin/kibana' | ||
| path.kibanaBin, | ||
| `-c ${path.kibanaConfig}` | ||
| ]); | ||
| }); | ||
|
|
||
| grunt.file.mkdir(userScriptsDir); | ||
| exec('please-manage-user', ['--output', userScriptsDir, 'kibana']); | ||
| appendFileSync(resolve(userScriptsDir, 'installer.sh'), 'chown kibana:kibana /opt/kibana/optimize'); | ||
| }); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,52 @@ | ||
| export default (grunt) => { | ||
| const version = grunt.config.get('pkg.version'); | ||
| const productionPath = `kibana/${version.match(/\d\.\d/)[0]}`; | ||
| const stagingPath = `kibana/staging/${version.match(/\d\.\d\.\d/)[0]}-XXXXXXX/repos/${version.match(/\d\./)[0]}x`; | ||
| const rpmFolder = 'centos'; | ||
| const debFolder = 'debian'; | ||
| const VERSION = grunt.config.get('pkg.version'); | ||
|
|
||
| const FOLDER_STAGING = `kibana/staging/${VERSION.match(/\d\.\d\.\d/)[0]}-XXXXXXX/repos/${VERSION.match(/\d\./)[0]}x`; | ||
| const FOLDER_PRODUCTION = `kibana/${VERSION.match(/\d\.\d/)[0]}`; | ||
|
|
||
| const FOLDERNAME_DEB = 'debian'; | ||
| const FOLDERNAME_RPM = 'centos'; | ||
|
|
||
| const PREFIX_STAGING_DEB = `${FOLDER_STAGING}/${FOLDERNAME_DEB}`; | ||
| const PREFIX_STAGING_RPM = `${FOLDER_STAGING}/${FOLDERNAME_RPM}`; | ||
| const PREFIX_PRODUCTION_DEB = `${FOLDER_PRODUCTION}/${FOLDERNAME_DEB}`; | ||
| const PREFIX_PRODUCTION_RPM = `${FOLDER_PRODUCTION}/${FOLDERNAME_RPM}`; | ||
|
|
||
| const FOLDER_CONFIG = '/etc/kibana'; | ||
| const FOLDER_LOGS = '/var/log/kibana'; | ||
| const FOLDER_HOME = '/usr/share/kibana'; | ||
|
|
||
| const FILE_KIBANA_CONF = `${FOLDER_CONFIG}/kibana.yml`; | ||
| const FILE_KIBANA_BINARY = `${FOLDER_HOME}/bin/kibana`; | ||
|
|
||
| return { | ||
| staging: { | ||
| bucket: 'download.elasticsearch.org', | ||
| debPrefix: `${stagingPath}/${debFolder}`, | ||
| rpmPrefix: `${stagingPath}/${rpmFolder}` | ||
| publish: { | ||
| staging: { | ||
| bucket: 'download.elasticsearch.org', | ||
| debPrefix: PREFIX_STAGING_DEB, | ||
| rpmPrefix: PREFIX_STAGING_RPM | ||
| }, | ||
| production: { | ||
| bucket: 'packages.elasticsearch.org', | ||
| debPrefix: PREFIX_STAGING_DEB, | ||
| rpmPrefix: PREFIX_STAGING_RPM | ||
| } | ||
| }, | ||
| production: { | ||
| bucket: 'packages.elasticsearch.org', | ||
| debPrefix: `${productionPath}/${debFolder}`, | ||
| rpmPrefix: `${productionPath}/${rpmFolder}` | ||
| user: 'kibana', | ||
| group: 'kibana', | ||
| name: 'kibana', | ||
| description: 'Explore\ and\ visualize\ your\ Elasticsearch\ data', | ||
| site: 'https://www.elastic.co', | ||
| vendor: 'Elasticsearch,\ Inc.', | ||
| maintainer: 'Kibana Team\ \<info@elastic.co\>', | ||
| license: 'Apache\ 2.0', | ||
| version: VERSION, | ||
| path: { | ||
| conf: FOLDER_CONFIG, | ||
| logs: FOLDER_LOGS, | ||
| home: FOLDER_HOME, | ||
| kibanaBin: FILE_KIBANA_BINARY, | ||
| kibanaConfig: FILE_KIBANA_CONF | ||
| } | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters