Skip to content

Commit

Permalink
bug.MDD149 - Error with baseurl and test.sh shellscript (#24)
Browse files Browse the repository at this point in the history
## Changelog for bug.MDD149 - Fixing Bugs in entrypoint_apache.sh script for MISP-Server 2.4.97-99
### Update Informations 
The entrypoint_apache.sh script takes care of the settings of apache2 and the basic settings of MISP itself. 

### General Changes
No general changes were made.

### Fixes & Improvements
- Fixed in entrypoint_apache.sh script the error message if no baseurl are set and the echo output after the misp-server is ready. The message fits to misp-robot:2.2-debian.

### Detailed Changes
- If no MISP_URL or MISP_FQDN are set, we output a error message to set one of these variables.
- After the misp-server entrypoint_apache.sh script is ready it output now: ' Your MISP-dockerized server has been successfully booted.'
  • Loading branch information
8ear committed Jan 7, 2019
1 parent 6a92255 commit 69acf5e
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions 2.4.99-debian/files/entrypoint_apache.sh
Expand Up @@ -18,7 +18,7 @@ PID_CERT_CREATER="/etc/apache2/ssl/SSL_create.pid"

# defaults

[ -z $MISP_URL -a -z $MISP_FQDN ] && echo "Please set 'MISP_FQDN' environment variable in docker-compose.override.yml file for misp-server!!!" && exit
[ -z $MISP_URL -a -z $MISP_FQDN ] && echo "Please set 'MISP_FQDN' or 'MISP_URL' environment variable in docker-compose.override.yml file for misp-server!!!" && exit
[ -z $MISP_URL -a ! -z $MISP_FQDN ] && export MISP_URL="https://$(echo $MISP_FQDN|cut -d '/' -f 3)"
[ -z $PGP_ENABLE ] && export PGP_ENABLE=0
[ -z $SMIME_ENABLE ] && export SMIME_ENABLE=0
Expand Down Expand Up @@ -432,8 +432,6 @@ echo "$STARTMSG #################################### started Apache2 with cmd:
echo
echo
cat <<__WELCOME__
Congratulations!
Your MISP docker has been successfully booted for the first time.
" ########### MISP environment is ready ###########"
" Please go to: ${MYSQL_HOST}"
" Login credentials:"
Expand All @@ -443,7 +441,7 @@ Your MISP docker has been successfully booted for the first time.
" Do not forget to change your SSL certificate with: make change-ssl"
" ##########################################################"
Congratulations!
Your MISP docker has been successfully booted for the first time.
Your MISP-dockerized server has been successfully booted.
__WELCOME__


Expand Down

0 comments on commit 69acf5e

Please sign in to comment.