Differential D3160

Configure nginx for webserver-alkane
ClosedPublic
Actions

Authored by dereckson on May 30 2023, 22:24.

Tags

None

Referenced Files

	F3785330: D3160.id8064.diff
	Tue, Nov 26, 08:36

	F3785329: D3160.id8063.diff
	Tue, Nov 26, 08:36

	F3785328: D3160.id8062.diff
	Tue, Nov 26, 08:36

	F3783041: D3160.id8064.diff
	Tue, Nov 26, 01:49

	Unknown Object (File)
	Sat, Nov 23, 12:06

	Unknown Object (File)
	Fri, Nov 22, 16:08

	Unknown Object (File)
	Tue, Nov 19, 09:03

	Unknown Object (File)
	Mon, Nov 18, 04:24

Subscribers

None

Details

Reviewers

dereckson
ledesillusionniste

Maniphest Tasks

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

Commits

rOPSeb74395dc14d: Configure nginx for webserver-alkane

Summary

Promote the current data for webserver-legacy to webserver-alkane role.

Files in roles/webserver-alkane/nginx/files/includes/ are provisioned
everywhere, like on webserver-legacy.

Vhosts can be provisioned to www-alkane (web-001) or www-dev (windriver)
by declaring them in a file in the relevant pillar/paas/alkane/ folder.
That's a breaking change from webserver-legacy. This change takes care
to dispatch the vhosts to the relevant server.

Test Plan

Deploy to WindRiver

Diff Detail

Repository

rOPS Nasqueron Operations

Lint

Lint Passed

Unit

No Test Coverage

Branch

main

Build Status

Buildable 4985
Build 5266: arc lint + arc unit

Event Timeline

dereckson created this revision.May 30 2023, 22:24

This change touches Wolfplex files. As such, administrative approval is needed from Wolfplex technical contact.

dereckson requested review of this revision.May 30 2023, 22:24

Harbormaster completed remote builds in B4984: Diff 8062.May 30 2023, 22:24

Fix for deployment

Harbormaster completed remote builds in B4985: Diff 8063.May 30 2023, 22:36

dereckson accepted this revision.May 30 2023, 22:42

This revision is now accepted and ready to land.May 30 2023, 22:42

Closed by commit rOPSeb74395dc14d: Configure nginx for webserver-alkane (authored by dereckson). · Explain WhyMay 30 2023, 22:43

This revision was automatically updated to reflect the committed changes.

dereckson added a commit: rOPSeb74395dc14d: Configure nginx for webserver-alkane.

In D3160#47888, @Herald wrote:

This change touches Wolfplex files. As such, administrative approval is needed from Wolfplex technical contact.

This change is no-op for the vhosts content: it's a refactoring of the old webserver-legacy role for PHP and static sites into the new webserver-alkane role.

Revision Contents
Changeset List

Path

Size

pillar/

paas/

alkane/

web-001/

46 lines

windriver/

13 lines

roles/

	webserver-alkane/	nginx/
	webserver-legacy/	nginx/

28 lines

files/

includes/

2 lines

vhosts/

dereckson.be/

2 lines

2 lines

2 lines

2 lines

2 lines

espace-win.org/

2 lines

2 lines

hypership.space/

2 lines

nasqueron.org/

2 lines

2 lines

autoconfig.conf

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

2 lines

trustspace.conf

2 lines

2 lines

test.ook.space/

migration.mediawiki.conf

40 lines

wolfplex.org/

2 lines

2 lines

2 lines

9 lines

webserver-legacy/

2 lines

nginx/

files/

includes/

vhosts/

dereckson.be/

espace-win.org/

hypership.space/

nasqueron.org/

autoconfig.conf

trustspace.conf

test.ook.space/

migration.mediawiki.conf

wolfplex.org/

Diff 8063

pillar/paas/alkane/web-001/main.sls

Loading...

pillar/paas/alkane/windriver/main.sls

Loading...

roles/webserver-alkane/nginx/config.sls

Loading...

roles/webserver-alkane/nginx/files/includes/pluton

Loading...

roles/webserver-alkane/nginx/files/vhosts/dereckson.be/assets.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/dereckson.be/hg.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/dereckson.be/mediawiki.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/dereckson.be/scherzo.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/dereckson.be/www.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/espace-win.org/cosmo.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/espace-win.org/www.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/hypership.space/www.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/api.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/assets.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/autoconfig.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/daeghrefn.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docker.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/docs.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/ftp.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/infra.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/join.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/labs.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/launch.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/packages.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/rain.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/tools51.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/trustspace.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/nasqueron.org/www.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/api.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/assets.conf

Loading...

roles/webserver-alkane/nginx/files/vhosts/wolfplex.org/www.conf

Loading...

roles/webserver-alkane/nginx/init.sls

Loading...

roles/webserver-legacy/init.sls

Loading...

roles/webserver-legacy/nginx/config.sls

Loading...

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

Loading...

roles/webserver-legacy/nginx/files/vhosts/dereckson.be/assets.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/dereckson.be/hg.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/dereckson.be/mediawiki.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/dereckson.be/scherzo.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/dereckson.be/www.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/espace-win.org/cosmo.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/espace-win.org/www.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/hypership.space/www.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/api.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/assets.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/autoconfig.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/daeghrefn.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docker.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/docs.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/ftp.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/infra.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/join.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/labs.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/launch.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/packages.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/rain.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/tools51.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/trustspace.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/nasqueron.org/www.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/test.ook.space/migration.mediawiki.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/api.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/assets.conf

Loading...

roles/webserver-legacy/nginx/files/vhosts/wolfplex.org/www.conf

Loading...

roles/webserver-legacy/nginx/init.sls

Loading...