diff --git a/configuration/environments_scripts/repo/usr/local/bin/mountnvmeswap b/configuration/environments_scripts/repo/usr/local/bin/mountnvmeswap index e900739a207..46f01bae78b 100755 --- a/configuration/environments_scripts/repo/usr/local/bin/mountnvmeswap +++ b/configuration/environments_scripts/repo/usr/local/bin/mountnvmeswap @@ -15,6 +15,9 @@ if [[ -n "${EPHEMERAL_VOLUME_NAME}" ]]; then echo FSTYPE was empty, creating swap partition mkswap $EPHEMERAL_VOLUME swapon --priority 2 -a $EPHEMERAL_VOLUME + elif [ "$FSTYPE" = "swap" ]; then + # it already is formatted as swap, so we can just use it + swapon --priority 2 -a $EPHEMERAL_VOLUME else echo "FSTYPE was $FSTYPE, not touching" fi diff --git a/configuration/environments_scripts/sailing_server/files/usr/local/bin/refreshInstance.sh b/configuration/environments_scripts/sailing_server/files/usr/local/bin/refreshInstance.sh index 54aad784d89..baab8eeba27 100755 --- a/configuration/environments_scripts/sailing_server/files/usr/local/bin/refreshInstance.sh +++ b/configuration/environments_scripts/sailing_server/files/usr/local/bin/refreshInstance.sh @@ -166,7 +166,7 @@ load_from_release_file () # and then on like above... fi if [ -n "${BUILD_COMPLETE_NOTIFY}" ]; then - echo "Build/Deployment process has been started - it can take 5 to 20 minutes until your instance is ready. " | mail -s "Build or Deployment of $INSTANCE_ID to $SERVER_HOME for server $SERVER_NAME starting" ${BUILD_COMPLETE_NOTIFY} + echo "Build/Deployment process has been started - it can take 5 to 20 minutes until your instance is ready. " | mail -r noreply@sapsailing.com -s "Build or Deployment of $INSTANCE_ID to $SERVER_HOME for server $SERVER_NAME starting" ${BUILD_COMPLETE_NOTIFY} fi RELEASE_FILE_NAME=${INSTALL_FROM_RELEASE}.tar.gz cd ${SERVER_HOME} @@ -227,7 +227,7 @@ build () if [ $MEM_TOTAL -lt 924 ]; then echo "Could not start build process with less than 1GB of RAM!" if [ -n "${BUILD_COMPLETE_NOTIFY}" ]; then - echo "Not enough RAM for completing the build process! You need at least 1GB. Instance NOT started!" | mail -s "Build of $INSTANCE_ID failed" ${BUILD_COMPLETE_NOTIFY} + echo "Not enough RAM for completing the build process! You need at least 1GB. Instance NOT started!" | mail -r noreply@sapsailing.com -s "Build of $INSTANCE_ID failed" ${BUILD_COMPLETE_NOTIFY} fi else if [[ $BUILD_BEFORE_START == "True" ]]; then @@ -266,12 +266,12 @@ deploy () if [ $STATUS -eq 0 ]; then echo "Deployment Successful" if [ -n "${BUILD_COMPLETE_NOTIFY}" ]; then - echo "OK - check the attachment for more information." | mail $MAIL_ATTACH_OPTION $SERVER_HOME/last_automatic_build.txt -s "Build or Deployment of $INSTANCE_ID complete" ${BUILD_COMPLETE_NOTIFY} + echo "OK - check the attachment for more information." | mail -r noreply@sapsailing.com $MAIL_ATTACH_OPTION $SERVER_HOME/last_automatic_build.txt -s "Build or Deployment of $INSTANCE_ID complete" ${BUILD_COMPLETE_NOTIFY} fi else echo "Deployment Failed" if [ -n "${BUILD_COMPLETE_NOTIFY}" ]; then - echo "ERROR - check the attachment for more information." | mail $MAIL_ATTACH_OPTION $SERVER_HOME/last_automatic_build.txt -s "Build of $INSTANCE_ID failed" ${BUILD_COMPLETE_NOTIFY} + echo "ERROR - check the attachment for more information." | mail -r noreply@sapsailing.com $MAIL_ATTACH_OPTION $SERVER_HOME/last_automatic_build.txt -s "Build of $INSTANCE_ID failed" ${BUILD_COMPLETE_NOTIFY} fi fi } diff --git a/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java b/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java index e3dfac7aac1..46848443697 100755 --- a/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java +++ b/java/com.sap.sailing.landscape/src/com/sap/sailing/landscape/procedures/SailingAnalyticsApplicationConfiguration.java @@ -201,6 +201,7 @@ extends AwsApplicationConfiguration getAdditionalJavaArgs() { final List result = new ArrayList<>(); Util.addAll(getAdditionalJavaArgsForSharedSecurity(SharedLandscapeConstants.DEFAULT_DOMAIN_NAME, SharedLandscapeConstants.DEFAULT_SECURITY_SERVICE_REPLICA_SET_NAME), result); + // TODO check whether we're really running under the default sapsailing.com domain, before activating SAP branding... result.add("-D"+ClientConfigurationListener.DEBRANDING_PROPERTY_NAME+"=false"); // activate branding when running under default SAP domain return result; } diff --git a/java/com.sap.sailing.www/release_notes_admin.html b/java/com.sap.sailing.www/release_notes_admin.html index 62fa9830534..453904e704a 100755 --- a/java/com.sap.sailing.www/release_notes_admin.html +++ b/java/com.sap.sailing.www/release_notes_admin.html @@ -33,6 +33,9 @@ corner of the image/video tile. When a logged-in user with a validated e-mail address clicks the button, a popup dialog allows for additional input and submitting of the take-down request, which will lead to an e-mail being sent to support@sapsailing.com. +
  • Fixed parsing of X-Forwarded-For header, now reporting the correct client IP in case of multiple proxies along the way.
    • +
  • Improved logging in case operations received from replicas are being applied. The log entry now shows the name of the server + where the operation originated from.

    • March 2025