Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2714 from TekExplorer/patch-1

Browse source 
entrypoint.sh; docker/ directory change.
This commit is contained in:
Dane Everitt 2020-11-15 14:43:17 -08:00 committed by GitHub
commit 1473bf9b8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/docker/entrypoint.sh vendored
View file

@ -42,10 +42,10 @@ else
echo "Checking if letsencrypt email is set." echo "Checking if letsencrypt email is set."
if [ -z $LE_EMAIL ]; then if [ -z $LE_EMAIL ]; then
echo "No letsencrypt email is set using http config." echo "No letsencrypt email is set using http config."
cp docker/default.conf /etc/nginx/conf.d/default.conf cp .github/docker/default.conf /etc/nginx/conf.d/default.conf
else else
echo "writing ssl config" echo "writing ssl config"
cp docker/default_ssl.conf /etc/nginx/conf.d/default.conf cp .github/docker/default_ssl.conf /etc/nginx/conf.d/default.conf
echo "updating ssl config for domain" echo "updating ssl config for domain"
sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/conf.d/default.conf
echo "generating certs" echo "generating certs"