Details

Reviewers

dereckson

Maniphest Tasks

T1828: Provide Alkane, Nasqueron PaaS to serve PHP and static sites

Commits

rOPS63531c98b75b: Consolidate nginx configuration into webserver-core role

Summary

Several roles configures nginx:

paas-docker
shellserver (Eglide)
webserver-legacy

Currently, each of them defines its own nginx configuration.

This change allows to configure nginx in two layers:

a common one in webserver-core role
specific vhosts and includes in the specific role

Ref T1828

Test Plan

Deploy on Eglide, Dwellers, Ysul then web-001

Diff Detail

Repository

rOPS Nasqueron Operations

Lint

Lint Passed

Unit

No Test Coverage

Branch

nginx-sync-config

Build Status

Buildable 4747
Build 5028: arc lint + arc unit

Event Timeline

dereckson requested review of this revision.Apr 11 2023, 18:46

dereckson created this revision.

Harbormaster completed remote builds in B4741: Diff 7657.Apr 11 2023, 18:46

Don't commit ocsp-ca-certs.pem, fix spaces

Harbormaster completed remote builds in B4742: Diff 7658.Apr 11 2023, 18:53

Spacey

Harbormaster completed remote builds in B4743: Diff 7659.Apr 11 2023, 22:20

Fixes after testing on Dwellers / docker-002 / Ysul

Harbormaster completed remote builds in B4746: Diff 7664.Apr 11 2023, 22:59

Keep it simple: just run as www on FreeBSD, this web group is only defined in webserver_legacy and not in use in wwwroot (/var/wwwrot or /var/51-wwwroot) currently.

Harbormaster completed remote builds in B4747: Diff 7665.Apr 11 2023, 23:29

Let specific role create vhost folder

Harbormaster completed remote builds in B4750: Diff 7670.Apr 12 2023, 00:35

dereckson edited the summary of this revision. (Show Details)Apr 12 2023, 18:03

dereckson added a child revision: D3013: Deploy Alkane on webserver-alkane role.Apr 14 2023, 00:11

Rebased

Harbormaster completed remote builds in B4780: Diff 7721.Apr 15 2023, 19:48

dereckson accepted this revision.Apr 15 2023, 19:50

This revision is now accepted and ready to land.Apr 15 2023, 19:50

Closed by commit rOPS63531c98b75b: Consolidate nginx configuration into webserver-core role (authored by dereckson). · Explain WhyApr 15 2023, 19:52

This revision was automatically updated to reflect the committed changes.

dereckson added a commit: rOPS63531c98b75b: Consolidate nginx configuration into webserver-core role.

Consolidate nginx configuration into webserver-core role
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 7665

.gitignore

Makefile

roles/paas-docker/nginx/config.sls

roles/paas-docker/nginx/files/includes/cors-open

roles/paas-docker/nginx/files/includes/geo_nasqueron

roles/paas-docker/nginx/files/includes/letsencrypt

roles/paas-docker/nginx/files/includes/proxy_params

roles/paas-docker/nginx/files/includes/tls

roles/paas-docker/nginx/files/nginx.conf

roles/shellserver/web-hosting/files/eglide/nginx/includes/letsencrypt.conf

roles/shellserver/web-hosting/files/eglide/nginx/nginx.conf

roles/shellserver/web-hosting/files/eglide/nginx/ssl_params

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000-fallback.conf

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-eglide.org.conf

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-server.conf

roles/webserver-core/map.jinja

roles/webserver-core/nginx/config.sls

roles/webserver-core/nginx/files/includes/cors-open

roles/webserver-core/nginx/files/includes/cors-open-no-cache

roles/webserver-core/nginx/files/includes/fastcgi_params

roles/webserver-core/nginx/files/includes/geo_nasqueron

roles/webserver-core/nginx/files/includes/letsencrypt

roles/webserver-core/nginx/files/includes/proxy_params

roles/webserver-core/nginx/files/includes/tls

roles/webserver-core/nginx/files/nginx.conf

roles/webserver-core/nginx/init.sls

roles/webserver-legacy/nginx/files/includes/cors-open

roles/webserver-legacy/nginx/files/includes/cors-open-no-cache

roles/webserver-legacy/nginx/files/includes/letsencrypt

utils/generate-ocsp-bundle.sh

Consolidate nginx configuration into webserver-core roleClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 7665

.gitignore

Makefile

roles/paas-docker/nginx/config.sls

roles/paas-docker/nginx/files/includes/cors-open

roles/paas-docker/nginx/files/includes/geo_nasqueron

roles/paas-docker/nginx/files/includes/letsencrypt

roles/paas-docker/nginx/files/includes/proxy_params

roles/paas-docker/nginx/files/includes/tls

roles/paas-docker/nginx/files/nginx.conf

roles/shellserver/web-hosting/files/eglide/nginx/includes/letsencrypt.conf

roles/shellserver/web-hosting/files/eglide/nginx/nginx.conf

roles/shellserver/web-hosting/files/eglide/nginx/ssl_params

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000-fallback.conf

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/000.conf

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-eglide.org.conf

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/001-server.conf

roles/webserver-core/map.jinja

roles/webserver-core/nginx/config.sls

roles/webserver-core/nginx/files/includes/cors-open

roles/webserver-core/nginx/files/includes/cors-open-no-cache

roles/webserver-core/nginx/files/includes/fastcgi_params

roles/webserver-core/nginx/files/includes/geo_nasqueron

roles/webserver-core/nginx/files/includes/letsencrypt

roles/webserver-core/nginx/files/includes/proxy_params

roles/webserver-core/nginx/files/includes/tls

roles/webserver-core/nginx/files/nginx.conf

roles/webserver-core/nginx/init.sls

roles/webserver-legacy/nginx/files/includes/cors-open

roles/webserver-legacy/nginx/files/includes/cors-open-no-cache

roles/webserver-legacy/nginx/files/includes/letsencrypt

utils/generate-ocsp-bundle.sh

Consolidate nginx configuration into webserver-core role
ClosedPublic
Actions

Revision Contents
Changeset List