Merge pull request #3361 from dokku/faster-nginx-install
Do not generate dhparam for tests
This commit is contained in:
@@ -31,10 +31,10 @@ chmod 0440 /etc/sudoers.d/dokku-nginx
|
|||||||
# if dhparam.pem has not been created, create it the first time
|
# if dhparam.pem has not been created, create it the first time
|
||||||
if [[ ! -f /etc/nginx/dhparam.pem ]]; then
|
if [[ ! -f /etc/nginx/dhparam.pem ]]; then
|
||||||
openssl dhparam -out /etc/nginx/dhparam.pem 2048
|
openssl dhparam -out /etc/nginx/dhparam.pem 2048
|
||||||
chown root:root /etc/nginx/dhparam.pem
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p /etc/nginx/conf.d
|
mkdir -p /etc/nginx/conf.d
|
||||||
|
chown root:root /etc/nginx/dhparam.pem
|
||||||
chown root:root /etc/nginx/conf.d
|
chown root:root /etc/nginx/conf.d
|
||||||
cat<<EOF > /etc/nginx/conf.d/dokku.conf
|
cat<<EOF > /etc/nginx/conf.d/dokku.conf
|
||||||
include $DOKKU_ROOT/*/nginx.conf;
|
include $DOKKU_ROOT/*/nginx.conf;
|
||||||
|
|||||||
@@ -9,6 +9,12 @@ setup_circle() {
|
|||||||
# need to add the dokku user to the docker group
|
# need to add the dokku user to the docker group
|
||||||
sudo usermod -G docker dokku
|
sudo usermod -G docker dokku
|
||||||
[[ "$1" == "buildstack" ]] && BUILD_STACK=true make -e stack
|
[[ "$1" == "buildstack" ]] && BUILD_STACK=true make -e stack
|
||||||
|
|
||||||
|
sudo add-apt-repository -y ppa:nginx/stable
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get -qq -y install nginx
|
||||||
|
sudo cp tests/dhparam.pem /etc/nginx/dhparam.pem
|
||||||
|
|
||||||
sudo -E CI=true make -e install
|
sudo -E CI=true make -e install
|
||||||
sudo -E make -e setup-deploy-tests
|
sudo -E make -e setup-deploy-tests
|
||||||
bash --version
|
bash --version
|
||||||
|
|||||||
8
tests/dhparam.pem
Normal file
8
tests/dhparam.pem
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
-----BEGIN DH PARAMETERS-----
|
||||||
|
MIIBCAKCAQEA50NOKSshXcM7Gd7krFcQ8SdAdrfaBVtoUPRTLbjTD/v36cuUMiXI
|
||||||
|
oJRa/CoZsg59iAHjkFG+LLyZnhOiUxNC/c6T6lOcdXR0an3YZEmFibfdQcoFAkiv
|
||||||
|
3xEz1rI5YALke46GTyg65EsRiaSV/auk2epo/FkYRBriOLS9I3UGAsTcnTLajCUg
|
||||||
|
YRc5jlRL6oZQ5Iy8Q+EhZkUOPoet/Qq6kamKFEiQIyaElgp5nkTOjJpLj9NsAynl
|
||||||
|
nAIo1NUzq/IHsomgcrn3Chx3CKjGviMe9EBaWAww0glqnQluyLZYbsT+DZeUB7tB
|
||||||
|
4sgK7KsiISIoP+H1NlDCxIHVvPZfMom/IwIBAg==
|
||||||
|
-----END DH PARAMETERS-----
|
||||||
Reference in New Issue
Block a user