Merge lp://staging/~ricardokirkner/locolander/vagrant into lp://staging/~ricardokirkner/locolander/trunk
Proposed by
Ricardo Kirkner
| Status: | Approved |
|---|---|
| Approved by: | Ricardo Kirkner |
| Approved revision: | 34 |
| Proposed branch: | lp://staging/~ricardokirkner/locolander/vagrant |
| Merge into: | lp://staging/~ricardokirkner/locolander/trunk |
| Diff against target: |
919 lines (+815/-0) 18 files modified
README (+25/-0) Vagrantfile (+26/-0) ansible/deploy/templates/production.py (+201/-0) ansible/deploy/webserver.yml (+67/-0) ansible/hosts (+5/-0) ansible/provision/dbserver.yml (+40/-0) ansible/provision/files/docker/authentication.conf (+4/-0) ansible/provision/files/docker/bazaar.conf (+3/-0) ansible/provision/site.yml (+3/-0) ansible/provision/templates/docker/95proxies (+3/-0) ansible/provision/templates/docker/Dockerfile (+33/-0) ansible/provision/templates/docker/environment (+10/-0) ansible/provision/templates/nginx/nginx.conf (+25/-0) ansible/provision/templates/postgresql/pg_hba.conf (+35/-0) ansible/provision/templates/postgresql/postgresql.conf (+96/-0) ansible/provision/templates/squid/squid.conf (+84/-0) ansible/provision/templates/supervisor/supervisor.conf (+27/-0) ansible/provision/webserver.yml (+128/-0) |
| To merge this branch: | bzr merge lp://staging/~ricardokirkner/locolander/vagrant |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner | Approve | ||
|
Review via email:
|
|||
Commit message
addded vagrant support using ansible to provision and deploy
Description of the change
Testing locolander
To post a comment you must log in.
Unmerged revisions
- 35. By Ricardo Kirkner
-
correctly keep current/last links in place
- 34. By Ricardo Kirkner
-
added instructions on how to deploy to a Vagrant vm
- 33. By Ricardo Kirkner
-
added playbook for deploying the application
- 32. By Ricardo Kirkner
-
added Vagrantfile including provisioning via ansible
- 31. By Ricardo Kirkner
-
added ansible playbook for provisioning the web/app server
- 30. By Ricardo Kirkner
-
added ansible playbook for provisioning database server
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM