Page MenuHomeDevCentral
Differential D952

Add a new vhost for kerozen's FB Bot
ClosedPublic
Actions

Authored by jokerozen on Apr 16 2017, 22:30.
Tags
None
Referenced Files
F3930613: D952.diff
Sun, Dec 22, 14:46
Unknown Object (File)
Sat, Dec 14, 10:30
Unknown Object (File)
Sat, Dec 14, 10:30
Unknown Object (File)
Sat, Dec 14, 10:30
Unknown Object (File)
Sat, Dec 14, 10:30
Unknown Object (File)
Sat, Dec 14, 10:30
Unknown Object (File)
Sat, Dec 14, 10:30
Unknown Object (File)
Sat, Dec 14, 10:30
View All Files
Subscribers
dereckson

Details

Reviewers
Sandlayth
jokerozen
dereckson
Commits
rOPS8e936b21fecc: Add a new vhost for kerozen's FB Bot
Summary

I need some verifications for letsencrypt and facebook
+ my first steps with salt and phabricator and arc etc.

Test Plan
  • salt eglide state.apply roles/shellserver/eglide-website/
  • salt eglide state.apply roles/shellserver/web-hosting/
  • check site is live

Diff Detail

Repository
rOPS Nasqueron Operations
Lint
Lint Passed
Unit
No Test Coverage
Branch
arcpatch-D952
Build Status
Buildable 1479
Build 1727: arc lint + arc unit

Event Timeline

jokerozen created this revision.Apr 16 2017, 22:30
dereckson added a reviewer: Sandlayth.Apr 16 2017, 23:41
dereckson added a subscriber: dereckson.Apr 16 2017, 23:45
dereckson added inline comments.
roles/shellserver/web-hosting/files/eglide/nginx/vhosts/002-robot.paysannerebelle.com.conf
7 ↗(On Diff #2426)

/002-robot.paysannerebelle.com.conf

The goal of this line is to know what files to edit in the repository when we read it directly on the server.

27 ↗(On Diff #2426)

I wonder if we shouldn't serve websites from a dedicated web hierarchy like /var/wwwroot/paysannerebelle.com/robot (and hlp:hlp this folder)

54 ↗(On Diff #2426)

You can discard the following lines.

It's to serve /home/foo/public_html as /~foo,
so we can have easily web directories.

jokerozen updated this revision to Diff 2427.Apr 17 2017, 17:37

fixed some errors, add new directory for the vhost in /var/wwwroot/

jokerozen marked 2 inline comments as done.Apr 17 2017, 17:40
jokerozen added inline comments.
roles/shellserver/web-hosting/files/eglide/nginx/vhosts/002-robot.paysannerebelle.com.conf
27 ↗(On Diff #2426)

I'm not sure I did that correctly...

dereckson added inline comments.Apr 17 2017, 17:42
roles/shellserver/web-hosting/files/eglide/nginx/vhosts/002-robot.paysannerebelle.com.conf
27 ↗(On Diff #2426)

I guess that would mean it takes /etc/nginx002-robot.paysannerebelle.com.conf/ as the base folder to host the site.

jokerozen added inline comments.Apr 17 2017, 18:04
roles/shellserver/web-hosting/files/eglide/nginx/vhosts/002-robot.paysannerebelle.com.conf
27 ↗(On Diff #2426)

oooops not what I wanted. trying one more time

jokerozen updated this revision to Diff 2428.Apr 17 2017, 18:06

fix the root dir for the vhost

jokerozen marked 4 inline comments as done.Apr 18 2017, 10:12
jokerozen updated this revision to Diff 2430.Apr 18 2017, 20:30

Add logs directory

dereckson mentioned this in D953: add logs directory.Apr 18 2017, 20:35
dereckson updated this revision to Diff 2431.Apr 18 2017, 23:09

Rebased against origin/master

Harbormaster completed remote builds in B1478: Diff 2431.Apr 18 2017, 23:09
jokerozen accepted this revision.Apr 19 2017, 01:07
This revision is now accepted and ready to land.Apr 19 2017, 01:07
dereckson requested changes to this revision.Apr 19 2017, 20:20
dereckson added inline comments.
roles/shellserver/eglide-website/init.sls
25

file.recurse allows you to copy files from the master.

This is used to provision websites, for example from a Git repository.

See https://docs.saltstack.com/en/latest/ref/states/all/salt.states.file.html

I guess you only wish to create a directory (file.directory).

This revision now requires changes to proceed.Apr 19 2017, 20:20
dereckson added a comment.Apr 19 2017, 20:21

I'll clarify the staging part in T1184.

dereckson updated this revision to Diff 2432.Apr 19 2017, 20:55
dereckson edited edge metadata.

Tweak and cleanup

This revision is now accepted and ready to land.Apr 19 2017, 20:55
Harbormaster completed remote builds in B1479: Diff 2432.Apr 19 2017, 20:55
dereckson accepted this revision.Apr 19 2017, 20:56
dereckson added a comment.Apr 19 2017, 21:03
Salt master
$ salt eglide state.apply roles/shellserver/eglide-website/
eglide:
----------
          ID: /var/www/html
    Function: file.recurse
      Result: True
     Comment: Recursively updated /var/www/html
     Started: 20:59:46.487317
    Duration: 36421.606 ms
     Changes:   
              ----------
              removed:
                  - /var/www/html/index.nginx-debian.html
----------
          ID: /var/wwwroot/paysannerebelle.com/robot/
    Function: file.directory
      Result: False
     Comment: No directory to create /var/wwwroot/paysannerebelle.com/robot in
     Started: 21:00:22.920989
    Duration: 22.489 ms
     Changes:   
----------
          ID: /var/log/www/eglide.org
    Function: file.directory
      Result: True
     Comment: Directory /var/log/www/eglide.org is in the correct state
     Started: 21:00:22.944607
    Duration: 8.51 ms
     Changes:   
----------
          ID: /var/log/www/robot.paysannerebelle.com
    Function: file.directory
      Result: True
     Comment: Directory /var/log/www/robot.paysannerebelle.com updated
     Started: 21:00:22.954233
    Duration: 18.056 ms
     Changes:   
              ----------
              /var/log/www/robot.paysannerebelle.com:
                  New Dir

Summary for eglide
------------
Succeeded: 3 (changed=2)
Failed:    1
------------
Total states run:     4
Total run time:  36.471 s
roles/shellserver/eglide-website/init.sls
25

recurse!

45

What should be created is /var/log/www/paysannerebelle.com by the way (after I edited nginx config to be coherent with other servers /var/wwwroot/domain.tld/sub/ and /var/log/www/domain.tld/sub....log)

dereckson updated this revision to Diff 2433.Apr 19 2017, 21:06

makedirs

Harbormaster completed remote builds in B1480: Diff 2433.Apr 19 2017, 21:06
dereckson updated this revision to Diff 2434.Apr 19 2017, 21:08

log directory fix

Harbormaster completed remote builds in B1481: Diff 2434.Apr 19 2017, 21:08
dereckson accepted this revision.Apr 19 2017, 21:16
dereckson edited the summary of this revision. (Show Details)
dereckson edited the test plan for this revision. (Show Details)
Closed by commit rOPS8e936b21fecc: Add a new vhost for kerozen's FB Bot (authored by dereckson, committed by dereckson). · Explain WhyApr 19 2017, 21:17
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
roles/
shellserver/
eglide-website/
14 lines
web-hosting/
files/
eglide/
nginx/
vhosts/
44 lines

Diff 2432

View Options

roles/shellserver/eglide-website/init.sls

Loading...
View Options

roles/shellserver/web-hosting/files/eglide/nginx/vhosts/robot.paysannerebelle.com.conf

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