Skip to content

Commit

Permalink
Merge pull request #896 from mkllnk/local
Browse files Browse the repository at this point in the history
Replace http with https and fake cert in local VMs
  • Loading branch information
mkllnk authored Oct 2, 2023
2 parents e2672a3 + d071bab commit 3323f8a
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 448 deletions.
26 changes: 0 additions & 26 deletions .devenv

This file was deleted.

3 changes: 3 additions & 0 deletions bin/lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh

exec ansible-lint site.yml playbooks/*.yml --exclude community
11 changes: 6 additions & 5 deletions inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ multiredis_instances:
#----------------------------------------------------------------------
# Database variables
db: openfoodnetwork
test_db: ofn_test
db_user: ofn_user
db_host: localhost
postgres_encoding: en_US.utf8
Expand Down Expand Up @@ -254,6 +253,8 @@ retired_core_devs:
# nginx config

app_root: "{{ current_path }}"
ssl_certificate: "/etc/letsencrypt/live/{{ certbot_cert_name | default(domain) }}/fullchain.pem"
ssl_certificate_key: "/etc/letsencrypt/live/{{ certbot_cert_name | default(domain) }}/privkey.pem"

nginx_official_repo: True

Expand Down Expand Up @@ -324,8 +325,8 @@ nginx_sites:
listen [::]:443 ssl http2;
server_name www.{{ domain }};
ssl_certificate /etc/letsencrypt/live/{{ certbot_cert_name | default(domain) }}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/{{ certbot_cert_name | default(domain) }}/privkey.pem;
ssl_certificate {{ ssl_certificate }};
ssl_certificate_key {{ ssl_certificate_key }};
{{ nginx_tls_cipher_suites }}
Expand All @@ -338,8 +339,8 @@ nginx_sites:
server_name {{ certbot_domains | default([domain]) | join(' ') }};
root {{ app_root }}/public;
ssl_certificate /etc/letsencrypt/live/{{ certbot_cert_name | default(domain) }}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/{{ certbot_cert_name | default(domain) }}/privkey.pem;
ssl_certificate {{ ssl_certificate }};
ssl_certificate_key {{ ssl_certificate_key }};
{{ nginx_tls_cipher_suites }}
Expand Down
65 changes: 0 additions & 65 deletions inventory/group_vars/lexi.yml

This file was deleted.

40 changes: 40 additions & 0 deletions inventory/group_vars/local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
rails_env: "staging"

ssl_certificate: "/etc/ssl/certs/ssl-cert-snakeoil.pem"
ssl_certificate_key: "/etc/ssl/private/ssl-cert-snakeoil.key"

# See https://github.com/openfoodfoundation/ofn-install/wiki/Setup for more info
checkout_zone: Australia
country_code: AU
currency: AUD
locale: en
language: en_AU.UTF-8
language_packages:
- language-pack-en-base
l10n_repo: https://github.com/openfoodfoundation/l10n_au.git
timezone: Melbourne

developer_email: [email protected]

users_sysadmin:
- "{{ core_devs }}"

# *** Test host configuration ***
#
# This is usually set in the host config but it's the same for all local
# containers.
domain: localhost

admin_email: [email protected]
mail_domain: example.com

# Add missing vars to emulate secrets.yml
db_password: 'f00d'
admin_password: 'ofn123'
secret_token: '511a3d0fa1551b9fa75a1aef5b47684905c64807963fa2c190272878366365'
google_maps_api_key: 'xxx'

mail_host: 'example.com'
mail_port: 25
smtp_username: 'admin'
smtp_password: 'password'
17 changes: 0 additions & 17 deletions inventory/group_vars/lxc.yml

This file was deleted.

63 changes: 0 additions & 63 deletions inventory/group_vars/test.yml

This file was deleted.

67 changes: 0 additions & 67 deletions inventory/group_vars/vagrant.yml

This file was deleted.

18 changes: 0 additions & 18 deletions inventory/host_vars/local_lexi/config.yml

This file was deleted.

24 changes: 0 additions & 24 deletions inventory/host_vars/local_test/config.yml

This file was deleted.

18 changes: 0 additions & 18 deletions inventory/host_vars/local_vagrant/config.yml

This file was deleted.

Loading

0 comments on commit 3323f8a

Please sign in to comment.