Merge branch 'master' into Create_ch_staging_instance

Author: mcmpp

files/keys/marco.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC/jaRoRrJhqXL3KTDlRE+yqqt/mpzjN5ttveGF4WnqVoMwWsK7R03Zh0WyFL62sZKx7hdtN5YTeVlIWDfl9I0nygA64eimAzuVE6V8IDHuXe9NbOuyeZYQ0qqb4N2ftiJ7m5A88/ZIf3nhm/YhTUEdCpgG2JzrsJrnsePYEmSEyZAeqm9KZgHDALL23SUYAfzr1WOzDXRfAdQDryMr9qrPD9TKOUDmZJAOkQTrJ19jI8Q3/1a6K74fd7leZOGsdkSI0o1Bsh8R/tf9IQIZ75PsFhZpq1utoBKHauChrjDjsQQrOGvVpgfy7sRVLBV7sQxgJqYM3IjBmAh7EYVIAGkN cardno:000500000399

inventory/group_vars/all.yml

@@ -82,7 +82,7 @@ postgres_encoding: en_US.utf8
 # Entries marked custom_* can be defined in /host_vars files, and will be appended
 # to the defaults if present. Make sure you use the "list" notation with the dashes!
 
-postgresql_version: "{% if ansible_distribution_major_version == '16' %}9.5{% elif ansible_distribution_major_version == '18' %}10{% elif ansible_distribution_major_version == '20' %}12{% elif ansible_distribution_major_version == '22' %}14{% else %}16{% endif %}"
+postgresql_version: "{% if ansible_distribution_major_version == '18' %}10{% elif ansible_distribution_major_version == '20' %}12{% elif ansible_distribution_major_version == '22' %}14{% else %}16{% endif %}"
 postgresql_data_dir: "/var/lib/postgresql/{{ postgresql_version }}/main"
 postgresql_bin_path: "/usr/lib/postgresql/{{ postgresql_version }}/bin"
 postgresql_config_path: "/etc/postgresql/{{ postgresql_version }}/main"

inventory/group_vars/ch.yml

@@ -19,5 +19,6 @@ developer_email: mikel.cordovilla@tegonal.com
 # Users listed here will have their key from /files/keys added to the app_user
 users_sysadmin:
   - mikel
+  - marco
   - "{{ core_devs }}"
 

inventory/group_vars/gr.yml

@@ -0,0 +1,23 @@
+---
+
+# See https://github.com/openfoodfoundation/ofn-install/wiki/Setup for more info
+checkout_zone: Europe
+country_code: GR
+currency: EUR 
+locale: el               # Default locale for OFN instance
+available_locales: el, en_FR    # Available locales for OFN instance
+language: en_US.UTF-8       # Default language for the server
+language_packages:          # Language packages for the server
+  - language-pack-en-base
+l10n_repo: https://github.com/mcmpp/l10n_el.git
+timezone: Athens
+
+
+# Used for the LetsEncrypt email setting
+developer_email: mikel.cordovilla@tegonal.com
+
+# Users listed here will have their key from /files/keys added to the app_user
+users_sysadmin:
+  - mikel
+  - "{{ core_devs }}"
+

inventory/host_vars/staging.openfoodnetwork.gr/config.yml

@@ -0,0 +1,33 @@
+---
+
+domain: staging.openfoodnetwork.gr
+host_id: gr-staging
+rails_env: staging
+
+admin_email: hello@openfoodnetwork.gr
+
+# Optional list of subdomains to register in letsencrypt certificate
+# Defaults to {{ domain }} if list is undefined
+#
+#certbot_domains:
+#  - example.com
+#  - www.example.com
+#  - info.example.com
+
+# Size in bytes. You can also use units like 1G, 512MiB or 1000KB. See: `man fallocate`
+# The default is `false`, not installing a swapfile.
+swapfile_size: 1G
+
+# Enable external database access for third party integrations
+#postgres_listen_addresses:
+#  - '*'
+#
+#custom_hba_entries:
+#  - { type: hostssl, database: "{{ db }}", user: zapier, address: '54.86.9.50/32', auth_method: md5 }
+#
+#custom_env_vars: |
+#  OFN_FEATURE_CONNECT_AND_LEARN="true"
+
+# Overridable Image Settings
+# attachment_url:
+# attachment_path:

inventory/host_vars/www.openfoodnetwork.gr/config.yml

@@ -0,0 +1,33 @@
+---
+
+domain: www.openfoodnetwork.gr
+host_id: ch-prod # country initials (eg uk, es, de) and environment (default is prod)
+rails_env: production
+
+admin_email: hello@openfoodnetwork.gr
+
+# Optional list of subdomains to register in letsencrypt certificate
+# Defaults to {{ domain }} if list is undefined
+#
+#certbot_domains:
+#  - example.com
+#  - www.example.com
+#  - info.example.com
+
+# Size in bytes. You can also use units like 1G, 512MiB or 1000KB. See: `man fallocate`
+# The default is `false`, not installing a swapfile.
+swapfile_size: 1G
+
+# Enable external database access for third party integrations
+#postgres_listen_addresses:
+#  - '*'
+#
+#custom_hba_entries:
+#  - { type: hostssl, database: "{{ db }}", user: zapier, address: '54.86.9.50/32', auth_method: md5 }
+#
+#custom_env_vars: |
+#  OFN_FEATURE_CONNECT_AND_LEARN="true"
+
+# Overridable Image Settings
+# attachment_url:
+# attachment_path:

inventory/hosts

@@ -206,6 +206,7 @@ uk_prod
 de_prod
 ie_prod
 hu_prod
+gr_prod
 
 #------------------------------------------------------------------------------
 # America
@@ -232,6 +233,7 @@ au_staging
 uk_staging
 fr_staging
 ch_staging
+gr_staging
 
 #------------------------------------------------------------------------------
 # All
@@ -257,6 +259,7 @@ cr
 hu
 ch
 fi
+gr
 
 #------------------------------------------------------------------------------
 # Switzerland
@@ -279,3 +282,16 @@ openfoodnetwork.fi ansible_host=157.180.89.177
 
 [fi:children]
 fi_prod
+
+#------------------------------------------------------------------------------
+# Greece
+
+[gr_prod]
+www.openfoodnetwork.gr ansible_host=185.4.135.184
+
+[gr_staging]
+staging.openfoodnetwork.gr ansible_host=185.4.132.192
+
+[gr:children]
+gr_prod
+gr_staging

roles/common/tasks/main.yml

@@ -48,24 +48,5 @@
       - webp
   tags: packages
 
-- name: install base packages for old distros
-  apt:
-    name: "{{ packages }}"
-  become: yes
-  vars:
-    packages:
-      # Ansible support
-      - python-psycopg2
-  tags: packages
-  when: ansible_distribution_major_version <= '18'
-
 - name: set up redis
   include_tasks: redis.yml
-
-- name: shut down memcached if present
-  service:
-    name: memcached
-    state: stopped
-  ignore_errors: yes
-  failed_when: false
-  become: yes