File tree Expand file tree Collapse file tree 7 files changed +27
-3
lines changed
dev/build/tasks/os_packages Expand file tree Collapse file tree 7 files changed +27
-3
lines changed Original file line number Diff line number Diff line change 1919
2020require ( '../apm' ) ( process . env . ELASTIC_APM_SERVICE_NAME || 'kibana-proxy' ) ;
2121require ( '../setup_node_env' ) ;
22+ require ( '../setup_node_env/root' ) ;
2223require ( './cli' ) ;
Original file line number Diff line number Diff line change 1919
2020require ( '../apm' ) ( ) ;
2121require ( '../setup_node_env/dist' ) ;
22+ require ( '../setup_node_env/root' ) ;
2223require ( './cli' ) ;
Original file line number Diff line number Diff line change 1717 * under the License.
1818 */
1919
20- require ( '../setup_node_env' ) ;
20+ require ( '../setup_node_env/no_transpilation ' ) ;
2121require ( './cli_keystore' ) ;
Original file line number Diff line number Diff line change @@ -44,9 +44,11 @@ case $1 in
4444 IS_UPGRADE=true
4545 fi
4646
47+ PACKAGE=deb
4748 setup
4849 ;;
4950 abort-deconfigure|abort-upgrade|abort-remove)
51+ PACKAGE=deb
5052 ;;
5153
5254 # Red Hat
@@ -63,7 +65,8 @@ case $1 in
6365 if [ " $1 " = " 2" ]; then
6466 IS_UPGRADE=true
6567 fi
66-
68+
69+ PACKAGE=rpm
6770 setup
6871 ;;
6972
@@ -86,3 +89,13 @@ if [ "$IS_UPGRADE" = "true" ]; then
8689 echo " OK"
8790 fi
8891fi
92+
93+ # the equivalent code for rpm is in posttrans
94+ if [ " $PACKAGE " = " deb" ]; then
95+ if [ ! -f " ${KBN_PATH_CONF} " /kibana.keystore ]; then
96+ /usr/share/kibana/bin/kibana-keystore create
97+ chown root:< %= group %> " ${KBN_PATH_CONF} " /kibana.keystore
98+ chmod 660 " ${KBN_PATH_CONF} " /kibana.keystore
99+ md5sum " ${KBN_PATH_CONF} " /kibana.keystore > " ${KBN_PATH_CONF} " /.kibana.keystore.initial_md5sum
100+ fi
101+ fi
Original file line number Diff line number Diff line change 1+ export KBN_PATH_CONF=${KBN_PATH_CONF:- <% = configDir % >}
2+
3+ if [ ! -f " ${KBN_PATH_CONF} " /kibana.keystore ]; then
4+ /usr/share/kibana/bin/kibana-keystore create
5+ chown root:< %= group %> " ${KBN_PATH_CONF} " /kibana.keystore
6+ chmod 660 " ${KBN_PATH_CONF} " /kibana.keystore
7+ md5sum " ${KBN_PATH_CONF} " /kibana.keystore > " ${KBN_PATH_CONF} " /.kibana.keystore.initial_md5sum
8+ fi
Original file line number Diff line number Diff line change @@ -94,6 +94,8 @@ export async function runFpm(
9494 resolve ( __dirname , 'package_scripts/pre_remove.sh' ) ,
9595 '--after-remove' ,
9696 resolve ( __dirname , 'package_scripts/post_remove.sh' ) ,
97+ '--rpm-posttrans' ,
98+ resolve ( __dirname , 'package_scripts/post_trans.sh' ) ,
9799
98100 // tell fpm about the config file so that it is called out in the package definition
99101 '--config-files' ,
Original file line number Diff line number Diff line change @@ -24,5 +24,4 @@ require('./harden');
2424
2525require ( 'symbol-observable' ) ;
2626require ( 'source-map-support/register' ) ;
27- require ( './root' ) ;
2827require ( './node_version_validator' ) ;
You can’t perform that action at this time.
0 commit comments