Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

fix(CenWeb): copy container file into the final destination folder #8179

Closed
wants to merge 3 commits into from
Closed

fix(CenWeb): copy container file into the final destination folder #8179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fb2dbb
fix(CenWeb): copy container file into the final destination folder
alk-jbrochet Dec 5, 2019
0132148
fix(CentWeb): add chown and final copy for the container file
alk-jbrochet Dec 5, 2019
4421eae
fix(functions): add missing container.php in src list
alk-jbrochet Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libinstall/CentWeb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ mkdir -p $TMP_DIR/final/config
cp -Rf $TMP_DIR/src/config/partition.d $TMP_DIR/final/config/partition.d
mv $TMP_DIR/src/config/centreon.config.php.template $TMP_DIR/src/config/centreon.config.php
cp -f $TMP_DIR/src/bootstrap.php $TMP_DIR/final
cp -f $TMP_DIR/src/container.php $TMP_DIR/final
cp -f $TMP_DIR/src/composer.json $TMP_DIR/final
cp -f $TMP_DIR/src/package.json $TMP_DIR/final
cp -f $TMP_DIR/src/package-lock.json $TMP_DIR/final
Expand Down Expand Up @@ -383,6 +384,9 @@ check_result $? "$(gettext "Change right for install directory")"
cp -f $TMP_DIR/final/bootstrap.php $INSTALL_DIR_CENTREON/bootstrap.php >> "$LOG_FILE" 2>&1
$CHOWN $WEB_USER:$WEB_GROUP $INSTALL_DIR_CENTREON/bootstrap.php

cp -f $TMP_DIR/final/container.php $INSTALL_DIR_CENTREON/container.php >> "$LOG_FILE" 2>&1
$CHOWN $WEB_USER:$WEB_GROUP $INSTALL_DIR_CENTREON/container.php

cp -Rf $TMP_DIR/final/vendor $INSTALL_DIR_CENTREON/ >> "$LOG_FILE" 2>&1
$CHOWN -R $WEB_USER:$WEB_GROUP $INSTALL_DIR_CENTREON/vendor

Expand Down
4 changes: 2 additions & 2 deletions libinstall/functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ yes_no_default() {
done
if [ "$res" = "$yes" ] ; then
return 0
else
else
return 1
fi
}
Expand Down Expand Up @@ -2074,7 +2074,7 @@ check_broker_user()
#----
copyInTempFile()
{
local srclistcp="bin cron config logrotate GPL_LIB lang lib snmptrapd src vendor www libinstall bootstrap.php composer.json package.json package-lock.json"
local srclistcp="bin cron config logrotate GPL_LIB lang lib snmptrapd src vendor www libinstall bootstrap.php container.php composer.json package.json package-lock.json"
# Prepare centreon Plugins
echo "$(gettext "Preparing Centreon temporary files")"
if [ -d $TMP_DIR ] ; then
Expand Down