Page MenuHomeDevCentral
Differential D1415

Consolidate nginx installation and common config files
ClosedPublic
Actions

Authored by dereckson on Mar 13 2018, 01:16.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Dec 25, 17:17
Unknown Object (File)
Sun, Dec 22, 11:59
Unknown Object (File)
Sun, Dec 15, 14:29
Unknown Object (File)
Sun, Dec 15, 14:09
Unknown Object (File)
Thu, Dec 12, 23:43
Unknown Object (File)
Thu, Dec 12, 06:52
Unknown Object (File)
Tue, Dec 10, 19:01
Unknown Object (File)
Tue, Dec 10, 18:46
View All Files
Subscribers
None

Details

Reviewers
dereckson
Commits
rOPSacf8f1cde9c5: Consolidate nginx installation and common config files
Summary

Both shellserver and webserver-legacy roles contains states
useful for every server with nginx. Those states are moved to
the webserver-core role.

Let's encrypt certbot client doesn't need to be installed for
Docker engines, as it runs then as a container.

Test Plan
  • salt equatower state.apply roles/webserver-core (Docker, should provision)
  • salt eglide state.apply roles/webserver-core test=True (non Docker, should be no op)

Diff Detail

Repository
rOPS Nasqueron Operations
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

dereckson requested review of this revision.Mar 13 2018, 01:16
dereckson created this revision.
Harbormaster completed remote builds in B2219: Diff 3608.Mar 13 2018, 01:16
dereckson edited the summary of this revision. (Show Details)Mar 15 2018, 18:54
dereckson updated this revision to Diff 3628.Mar 15 2018, 20:44

Rebase

Harbormaster completed remote builds in B2230: Diff 3628.Mar 15 2018, 20:44
dereckson edited the test plan for this revision. (Show Details)Mar 15 2018, 20:45
dereckson updated this revision to Diff 3632.Mar 15 2018, 21:17

When it's not broken, don't fix it?

Harbormaster completed remote builds in B2233: Diff 3632.Mar 15 2018, 21:17
dereckson accepted this revision.Mar 15 2018, 21:19
$ salt equatower state.apply roles/webserver-core test=True
equatower:
----------
          ID: nginx
    Function: pkg.installed
      Result: None
     Comment: The following packages would be installed/updated: nginx
     Started: 02:19:08.583014
    Duration: 935.315 ms
     Changes:
----------
          ID: /usr/bin/list-nginx-vhosts-conf
    Function: file.managed
      Result: None
     Comment: The file /usr/bin/list-nginx-vhosts-conf is set to be changed
     Started: 02:19:09.521603
    Duration: 34.917 ms
     Changes:
----------
          ID: /usr/bin/autochmod
    Function: file.managed
      Result: None
     Comment: The file /usr/bin/autochmod is set to be changed
     Started: 02:19:09.556725
    Duration: 12.39 ms
     Changes:

Summary for equatower
------------
Succeeded: 3 (unchanged=3)
Failed:    0
------------
Total states run:     3
Total run time: 982.622 ms
This revision is now accepted and ready to land.Mar 15 2018, 21:19
dereckson updated this revision to Diff 3635.Mar 15 2018, 23:20

Install TCL too

Harbormaster completed remote builds in B2235: Diff 3635.Mar 15 2018, 23:20
dereckson accepted this revision.Mar 16 2018, 01:18
Closed by commit rOPSacf8f1cde9c5: Consolidate nginx installation and common config files (authored by dereckson). · Explain WhyMar 16 2018, 01:18
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
roles/
shellserver/
userland-software/
20 lines
webserver-core/
5 lines
nginx/
22 lines
nginx/
4 lines
software.sls
init.sls
6 lines
tools/
13 lines
webserver-core/
nginx/
files/
includes/
webserver-legacy/
nginx/
files/
includes/
2 lines
2 lines
webserver-legacy/
nginx/
files/
includes/

Diff 3649

View Options

roles/shellserver/userland-software/web.sls

Loading...
View Options

roles/webserver-core/init.sls

Loading...
View Options

roles/webserver-core/nginx/config.sls

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

roles/webserver-core/nginx/init.sls

Loading...
View Options

roles/webserver-core/nginx/software.sls

Loading...
View Options

roles/webserver-core/tools/init.sls

Loading...
View Options

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

Loading...
View Options

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

Loading...
Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator