Skip to content

Commit

Permalink
landingpage work in progress (idaholab#252)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmguero committed Jan 9, 2024
1 parent 50cc233 commit fafa2f1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion nginx/landingpage/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ <h3>API</h3></a>
<div class="row">
<div class="col-lg-6 h-100 text-center text-lg-start my-auto">
<p class="text-muted small mb-4 mb-lg-0">
&copy; 2024 Battelle Energy Alliance, LLC; developed at INL and released through the cooperation of the
<a href="https://github.com/idaholab/Malcolm/releases">Malcolm MALCOLM_VERSION_REPLACER</a> &copy; 2024 Battelle Energy Alliance, LLC; developed at INL and released through the cooperation of the
Cybersecurity and Infrastructure Security Agency of the U.S. Department of Homeland Security.</p>
</div>
<div class="col-lg-6 h-100 text-center text-lg-end my-auto">
Expand Down
4 changes: 4 additions & 0 deletions nginx/scripts/docker_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ if [ "$socketMissing" = 1 -a "$1" = 'supervisord' -a "$2" = '-c' -a "$3" = '/etc
exit 1
fi

NGINX_LANDING_INDEX_HTML=/usr/share/nginx/html/index.html

# set up for HTTPS/HTTP and NGINX HTTP basic vs. LDAP/LDAPS/LDAP+StartTLS auth

# "include" file that sets 'ssl on' and indicates the locations of the PEM files
Expand Down Expand Up @@ -244,6 +246,8 @@ if [[ ! -f /etc/nginx/auth/htpasswd ]] && [[ -f /tmp/auth/default/htpasswd ]]; t
rm -rf /tmp/auth/* || true
fi

[[ -f "${NGINX_LANDING_INDEX_HTML}" ]] && sed -i "s/MALCOLM_VERSION_REPLACER/v${MALCOLM_VERSION:-unknown} (${VCS_REVISION:-} @ ${BUILD_DATE:-})/g" "${NGINX_LANDING_INDEX_HTML}"

rm -rf /var/log/nginx/* || true

# start supervisor (which will spawn nginx, stunnel, etc.) or whatever the default command is
Expand Down

0 comments on commit fafa2f1

Please sign in to comment.