diff --git a/.github/workflows/deployment.production.nginx.yaml b/.github/workflows/deployment.production.nginx.yaml index 7cf2b8b845..debff429ae 100644 --- a/.github/workflows/deployment.production.nginx.yaml +++ b/.github/workflows/deployment.production.nginx.yaml @@ -32,5 +32,5 @@ jobs: # Build and deploy LighthouseRunner. - run: sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD - run: sudo docker buildx create --use - - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID --push -f ./nginx/Dockerfile . - - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:latest --push -f ./nginx/Dockerfile . + - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID --push -f ./nginx/Dockerfile ./nginx + - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:latest --push -f ./nginx/Dockerfile ./nginx diff --git a/.github/workflows/deployment.staging.nginx.yaml b/.github/workflows/deployment.staging.nginx.yaml index 131be7cf10..47d19c80ee 100644 --- a/.github/workflows/deployment.staging.nginx.yaml +++ b/.github/workflows/deployment.staging.nginx.yaml @@ -34,5 +34,5 @@ jobs: # Build and deploy nginx. - run: sudo docker login --username $DOCKERHUBUSERNAME --password $DOCKERHUBPASSWORD - run: sudo docker buildx create --use - - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID-staging --push -f ./nginx/Dockerfile . - - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:staging --push -f ./nginx/Dockerfile . + - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:4.0.$CI_PIPELINE_ID-staging --push -f ./nginx/Dockerfile ./nginx + - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:staging --push -f ./nginx/Dockerfile ./nginx diff --git a/Home/public/img/amersc.png b/Home/public/img/amersc.png new file mode 100644 index 0000000000..4ebb98029e Binary files /dev/null and b/Home/public/img/amersc.png differ diff --git a/Home/public/img/sodexo.svg b/Home/public/img/sodexo.svg new file mode 100644 index 0000000000..01c6023ab7 --- /dev/null +++ b/Home/public/img/sodexo.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + diff --git a/Home/views/api-monitoring.ejs b/Home/views/api-monitoring.ejs index 05507ba7d2..18281cfd1d 100644 --- a/Home/views/api-monitoring.ejs +++ b/Home/views/api-monitoring.ejs @@ -271,7 +271,7 @@ <%- include('cta-buttons') -%> - <%- include("testimonials", { +

How monitoring helps your business?

diff --git a/Home/views/cta-buttons.ejs b/Home/views/cta-buttons.ejs index 4a9602d81a..3961c93879 100644 --- a/Home/views/cta-buttons.ejs +++ b/Home/views/cta-buttons.ejs @@ -11,7 +11,7 @@ Try Free for 14 days -
  • +
  • Request Demo diff --git a/Home/views/customer-section.ejs b/Home/views/customer-section.ejs index ed363540fb..80f2bb6e30 100644 --- a/Home/views/customer-section.ejs +++ b/Home/views/customer-section.ejs @@ -1,11 +1,10 @@
    - - See our customers +
    • - cloudboost + sodexo
    • ViewSonic @@ -17,15 +16,14 @@ securonix
    • - elasticstack + amersc
    • rentacenter
      • -
    -     +
    \ No newline at end of file diff --git a/Home/views/index.ejs b/Home/views/index.ejs index 7cb647d8fe..160dbbdaf2 100755 --- a/Home/views/index.ejs +++ b/Home/views/index.ejs @@ -118,11 +118,6 @@ <%- include('feature-table') -%> -
    - <%- include('customer-section') -%> - -
    -
    <%- include('comparision-chart') -%> @@ -292,7 +287,7 @@ <%- include('cta-buttons') -%> - <%- include("testimonials", { title: "Software teams around the world love OneUptime!" , +
    diff --git a/Home/views/private-status-page.ejs b/Home/views/private-status-page.ejs index 85627118ac..c0bd4e9766 100644 --- a/Home/views/private-status-page.ejs +++ b/Home/views/private-status-page.ejs @@ -371,7 +371,7 @@ <%- include('cta-buttons') -%> - <%- include("testimonials", { + <%- include('integration') -%> diff --git a/Home/views/public-status-page.ejs b/Home/views/public-status-page.ejs index d73b5c7465..e4dfd81f51 100644 --- a/Home/views/public-status-page.ejs +++ b/Home/views/public-status-page.ejs @@ -355,7 +355,7 @@ <%- include('cta-buttons') -%> - <%- include("testimonials", { + <%- include('integration') -%> diff --git a/Home/views/website-monitoring.ejs b/Home/views/website-monitoring.ejs index 98c453ff4e..ea308a6728 100644 --- a/Home/views/website-monitoring.ejs +++ b/Home/views/website-monitoring.ejs @@ -273,7 +273,7 @@ <%- include('cta-buttons') -%> - <%- include("testimonials", { +

    How monitoring helps your business?

    diff --git a/Nginx/default.conf b/Nginx/default.conf index e9cc7c2503..4f81fe632d 100644 --- a/Nginx/default.conf +++ b/Nginx/default.conf @@ -1,6 +1,5 @@ upstream accounts { - server accounts:3003; # server name is same as the service name used in docker-compose file - # port on which the service is running...NOT the exposed port(the RHS port in docker-compose ports attr.) + server accounts:3003; } upstream admin { server AdminDashboard:3100; @@ -35,14 +34,10 @@ upstream probe1 { upstream probe2 { server probe2:3025; } -server { - listen 80; - server_name localhost; - return 301 https://$host$request_uri; -} server { listen 443 ssl; # Port HTTPS + listen 80; server_name localhost; ssl_certificate /etc/nginx/certs/nginx.crt; @@ -51,6 +46,7 @@ server { location / { proxy_pass http://home/; } + location /accounts { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr;