Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add apache #5122

Merged
merged 33 commits into from
Aug 6, 2019
Merged

Add apache #5122

merged 33 commits into from
Aug 6, 2019

Conversation

wpears
Copy link
Member

@wpears wpears commented Jul 23, 2019

This PR adds our formerly private apache conf files into our open source repo. The benefits are manifold:

  • better alignment with out open source policy
  • easier to set up a production-like system locally (specifically, adding an option to run a docker container running apache and invoking django through wsgi, rather than using runserver. This will come in a later PR in order to not clutter this one).
  • with the point above, it will also be easier and faster to change and test our apache setup (or even experiment with replacing apache ^_______^)

wpears and others added 21 commits July 22, 2019 11:11
add envvars to confs

composed apache-in-docker

add ignore entries and fix up module loading

scrub

factor out ansible dependents and crystalize envvars

Update elasticsearch dockerfile to prevent cluster churn
The /data-research/hmda path is now served by Wagtail. This hmda.conf
file is no longer part of the regular cf.gov deploy.
The data.json path is now served via a different Apache alias which
points to a Django static file.
…ply bring the apache docs into this repo to be handled used in the deploy process
Copy link
Member

@chosak chosak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the omission of the maintenance.conf file in the internal repo deliberate?

cfgov/apache/conf.d/alias.tmpl Outdated Show resolved Hide resolved
cfgov/apache/conf.d/newsroom.conf Outdated Show resolved Hide resolved
Copy link
Member

@hkeeler hkeeler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, looks good. Put up a few questions/comments.

ServerName consumerfinance.gov

WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess django processes=${APACHE_PROCESS_COUNT} threads=15 display-name=%{GROUP} python-path=${CFGOV_CURRENT}/venv/lib/python2.7/site-packages:${CFGOV_CURRENT}/venv/lib64/python2.7/site-packages:${CFGOV_CURRENT} home=${CFGOV_CURRENT}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not something we need to change now, just a heads up that python-path values will need to change once we want to support python2 and python3 services. Also, in a Docker world, you probably won't be using a virtualenv, though I suppose we could if it'd help keep both setups compatible with each other.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we got he mod-wsgi-express route, this file won't be relevant in the docker world.

cfgov/apache/conf/magic Outdated Show resolved Hide resolved
cfgov/apache/conf.d/redirects.conf Outdated Show resolved Hide resolved
@CFPBot CFPBot merged commit 485a8f7 into master Aug 6, 2019
@wpears wpears deleted the add-apache branch August 21, 2019 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants