From 1a02e344b53a7068c2a11e9050e2967579de3d63 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Wed, 31 Jul 2019 14:55:36 +0200 Subject: [PATCH] [TESTS] ADD ansible.vhost setup-ngxblocker test REF: #285 --- .../vhost-cases/ansible.vhost | 51 +++++++++++++++++++ .dev-tools/test-setupngxblocker.sh | 6 +++ 2 files changed, 57 insertions(+) create mode 100644 .dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost diff --git a/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost b/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost new file mode 100644 index 000000000..3861d1c68 --- /dev/null +++ b/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost @@ -0,0 +1,51 @@ +server { + listen 8080; + server_name xxxx; + + location / { + return 301 https://$host$request_uri; + } +} + +server { + listen 443 ssl http2; + server_name xxxxx + root {{ vhost_www_directory }}/sites/public; + + include {{ nginx_blockbots_cfg_path }}; + + ssl_certificate {{ full_certificates_path }}/fullchain.cer; + ssl_certificate_key {{ full_certificates_path }}/{{ domain_to_protect }}.key; + + include {{ nginx_yprox_shared_fo_location_path }}; + include {{ nginx_yprox_conf_fo_logs_path }}; +} + +server { + listen 443 ssl http2; + root {{ vhost_www_directory }}/admin/public; + server_name admin.{{ domain_to_protect }}; + + include {{ nginx_yprox_security_path }}; + include {{ nginx_yprox_ssl_path }}; + + ssl_certificate {{ full_certificates_path }}/fullchain.cer; + ssl_certificate_key {{ full_certificates_path }}/{{ domain_to_protect }}.key; + + include {{ nginx_yprox_shared_bo_location_path }}; + include {{ nginx_yprox_conf_bo_logs_path }}; +} + +server { + listen 443 ssl http2; + server_name alp.{{ domain_to_protect }}; + + root {{ alp_live_directory }}; + include {{ nginx_bots_cfg_path }}/blockbots.conf; + index index.html; + + ssl_certificate {{ full_certificates_path }}/fullchain.cer; + ssl_certificate_key {{ full_certificates_path }}/{{ domain_to_protect }}.key; + + include {{ nginx_yprox_shared_alp_location_path }}; +} \ No newline at end of file diff --git a/.dev-tools/test-setupngxblocker.sh b/.dev-tools/test-setupngxblocker.sh index 59e783a0e..25516d8e0 100755 --- a/.dev-tools/test-setupngxblocker.sh +++ b/.dev-tools/test-setupngxblocker.sh @@ -155,6 +155,11 @@ sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/commented/opensuse.conf sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -x -m ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/commented/opensuse.conf.modified } +setup_ansible1 () { +sudo cp ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.conf ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ansible.vhost +sudo bash ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/setup-ngxblocker -v ${TRAVIS_BUILD_DIR}/.dev-tools/setup-ngxblocker/vhost-cases/ -x -e vhost +} + # ----------------- # Trigger Functions # ----------------- @@ -178,6 +183,7 @@ setup_fedoraMI2 setup_opensuse setup_opensuseMI setup_opensuseMI2 +setup_ansible1 # ---------------------- # Exit With Error Number