2024-09-18 various fixes

Author: sdarwin

defaults/main.yml

@@ -358,11 +358,11 @@ mailman3_distribute_maps_virtualenv_dir: "{{ mailman3_core_var_dir }}/distribute
 # Base set of Python packages
 __mailman3_pip_packages:
   # - django-allauth==0.54.0
-  - django-mailman3==1.3.13
+  - django-mailman3==1.3.15
   - importlib-resources==5.13.0
   - mailman
   - mailman-web==0.0.9
-  - HyperKitty==1.3.10
+  - HyperKitty==1.3.9
   - django-allauth==0.63.3
   - mailman-hyperkitty  # ??
   - elasticsearch==7.17.9
@@ -393,6 +393,8 @@ __mailman3_system_dependency_packages:
     - python3-setuptools
     # - memcached
     # - libmemcached-tools
+    - libmemcached-dev
+    - zlib1g-dev
     - redis
   redhat-7:
     - rh-python38   # requires EL7+ and CentOS SCL
@@ -477,8 +479,10 @@ elasticsearch_version: '7.x'
 elasticsearch_network_host: "0.0.0.0"
 elasticsearch_http_port: 9200
 elasticsearch_extra_options: ''
-elasticsearch_heap_size_min: 1g
-elasticsearch_heap_size_max: 2g
+# elasticsearch_heap_size_min: 1g
+# elasticsearch_heap_size_max: 1g
+elasticsearch_heap_size_min: 500m
+elasticsearch_heap_size_max: 500m
 # used by Django, not necessarily by elasticsearch itself:
 elasticsearch_index_name: mailman
 elasticsearch_url: "http://127.0.0.1:9200/"

tasks/swap.yml

@@ -8,7 +8,6 @@
       ansible.builtin.stat:
         path: "{{ swap_file_path }}"
         get_checksum: false
-        get_md5: false
         get_mime: false
         get_attributes: false
       register: swap_file_check
@@ -92,6 +91,22 @@
             dump: 0
             state: present
 
+        - name: Check if swap is already defined in fstab
+          ansible.builtin.lineinfile:
+            state: absent
+            path: "/etc/fstab"
+            regexp: "{{ swap_file_path }} none swap defaults 0 0"
+          check_mode: true
+          changed_when: false # This just makes things look prettier in the logs
+          register: check
+
+        - name: Define swap in fstab
+          ansible.builtin.lineinfile:
+            state: present
+            path: "/etc/fstab"
+            line: "{{ swap_file_path }} none swap defaults 0 0"
+          when: check.found == 0
+
         - name: Turn on swap
           ansible.builtin.command: swapon -a
           when: swap_enable

templates/settings.py.j2

@@ -204,10 +204,12 @@ if env("ADD_REMOTE_ADDR_MIDDLEWARE", None):
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, 'static_custom')
-]
-
-TEMPLATES[0]['DIRS'] = [
-    os.path.join(BASE_DIR, 'templates')
-]
+# 2024-09. Temporarily removing customizations. Can be returned later.
+
+# STATICFILES_DIRS = [
+#     os.path.join(BASE_DIR, 'static_custom')
+# ]
+#
+# TEMPLATES[0]['DIRS'] = [
+#     os.path.join(BASE_DIR, 'templates')
+# ]