diff --git a/deploy.sh b/deploy.sh index 68418c1..bf66906 100755 --- a/deploy.sh +++ b/deploy.sh @@ -61,7 +61,7 @@ if [ "${LATEST_COMMIT}" != "$(cat /tmp/misp-latest.sha)" ]; then # Current file list of everything to gpg sign and transfer - FILE_LIST="MISP_${VER}@${LATEST_COMMIT}-vmware.zip output-virtualbox-iso/MISP_${VER}@${LATEST_COMMIT}.ova packer_virtualbox-iso_virtualbox-iso_sha1.checksum packer_virtualbox-iso_virtualbox-iso_sha256.checksum packer_virtualbox-iso_virtualbox-iso_sha384.checksum packer_virtualbox-iso_virtualbox-iso_sha512.checksum MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha1 MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha256 MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha384 MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha512 /tmp/mysql.txt" + FILE_LIST="MISP_${VER}@${LATEST_COMMIT}-vmware.zip output-virtualbox-iso/MISP_${VER}@${LATEST_COMMIT}.ova packer_virtualbox-iso_virtualbox-iso_sha1.checksum packer_virtualbox-iso_virtualbox-iso_sha256.checksum packer_virtualbox-iso_virtualbox-iso_sha384.checksum packer_virtualbox-iso_virtualbox-iso_sha512.checksum MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha1 MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha256 MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha384 MISP_${VER}@${LATEST_COMMIT}-vmware.zip.sha512" # Create the latest MISP export directory ssh ${REL_USER}@${REL_SERVER} mkdir -p export/MISP_${VER}@${LATEST_COMMIT} @@ -79,7 +79,6 @@ if [ "${LATEST_COMMIT}" != "$(cat /tmp/misp-latest.sha)" ]; then ssh ${REL_USER}@${REL_SERVER} cd export ; tree -T "MISP VM Images" -H https://www.circl.lu/misp-images/ -o index.html # Remove files for next run - rm /tmp/mysql.txt rm -r output-virtualbox-iso rm -r output-vmware-iso rm *.checksum *.zip *.sha* diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index ac39aaa..11166e3 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -72,7 +72,7 @@ GPG_REAL_NAME='Autogenerated Key' GPG_COMMENT='WARNING: MISP AutoGenerated VM consider this Key VOID!' GPG_EMAIL_ADDRESS='admin@admin.test' GPG_KEY_LENGTH='2048' -GPG_PASSPHRASE='' +GPG_PASSPHRASE='Password1234' # php.ini configuration upload_max_filesize=50M @@ -412,13 +412,14 @@ sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "Plugin.ZeroMQ_organisation sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "GnuPG.email" "admin@admin.test" sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "GnuPG.homedir" "/var/www/MISP/.gnupg" +sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "GnuPG.password" "Password1234" sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "MISP.host_org_id" 1 sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "MISP.email" "info@admin.test" sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "MISP.disable_emailing" true sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "MISP.contact" "info@admin.test" sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "MISP.disablerestalert" true sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "MISP.showCorrelationsOnIndex" true -sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "Session.autoRegenerate" false +sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "Session.autoRegenerate" 0 sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "Session.timeout" 600 sudo $PATH_TO_MISP/app/Console/cake Admin setSetting "Session.cookie_timeout" 3600 @@ -559,6 +560,7 @@ sudo chmod -R 750 $PATH_TO_MISP sudo chmod -R g+ws $PATH_TO_MISP/app/tmp sudo chmod -R g+ws $PATH_TO_MISP/app/files sudo chmod -R g+ws $PATH_TO_MISP/app/files/scripts/tmp +sudo chmod 700 $PATH_TO_MISP/.gnupg echo "--- Setting Baseurl ---" sudo $PATH_TO_MISP/app/Console/cake Baseurl "" @@ -569,7 +571,7 @@ echo "Web interface (default network settings): $MISP_BASEURL" echo "MISP admin: admin@admin.test/admin" echo "Shell/SSH: misp/Password1234" echo "MySQL: $DBUSER_ADMIN/$DBPASSWORD_ADMIN - $DBUSER_MISP/$DBPASSWORD_MISP" -echo "MySQL: $DBUSER_ADMIN/$DBPASSWORD_ADMIN - $DBUSER_MISP/$DBPASSWORD_MISP" > /tmp/mysql.txt +echo "MySQL: $DBUSER_ADMIN/$DBPASSWORD_ADMIN - $DBUSER_MISP/$DBPASSWORD_MISP" > ~/mysql.txt TIME_END=$(date +%s)