Configure Elasticsearch

adshares · Jan 25, 2023 · 3ebf974 · 3ebf974
1 parent c628c5a
commit 3ebf974
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/tasks/config.yaml b/tasks/config.yaml
@@ -3,7 +3,9 @@
     file: "../vars/main.yaml"
 
 - name: "{{ service_name }} | config | Load config"
-  ansible.builtin.include_vars: "{{ item }}"
+  ansible.builtin.include_vars: "{{ config_file }}"
+  loop_control:
+    loop_var: 'config_file'
   with_first_found:
     - files: ["{{ service_name }}.yaml"]
       skip: true

diff --git a/tasks/setup/elasticsearch.yaml b/tasks/setup/elasticsearch.yaml
@@ -15,6 +15,18 @@
     update_cache: true
   when: "'elasticsearch' not in ansible_facts.packages"
 
+- name: "{{ service_name }} | setup | elastic | Set elastic config"
+  ansible.builtin.lineinfile:
+    path: "etc/elasticsearch/elasticsearch.yml"
+    regexp: "^{{ it.key }}\\s*:"
+    line: "{{ it.key }}: {{ it.value }}"
+  loop:
+    - { key: 'bootstrap.memory_lock', value: 'true' }
+    - { key: 'indices.memory.index_buffer_size', value: '1GB' }
+  loop_control:
+    label: "{{ it.key }}"
+    loop_var: 'it'
+
 - name: "{{ service_name }} | setup | elastic | Start Elasticsearch"
   ansible.builtin.service:
     name: elasticsearch

diff --git a/tasks/setup/mysql.yaml b/tasks/setup/mysql.yaml
@@ -50,7 +50,7 @@
     - { key: 'innodb_log_files_in_group', value: '2' }
     - { key: 'innodb_log_buffer_size', value: '64M' }
     - { key: 'innodb_flush_log_at_trx_commit', value: '2' }
-    - { key: 'innodb_lock_wait_timeout', value: '2' }
+    - { key: 'innodb_lock_wait_timeout', value: '4' }
     - { key: 'innodb_thread_concurrency', value: '0' }
     - { key: 'innodb_flush_method', value: 'O_DIRECT_NO_FSYNC' }
     - { key: 'innodb_buffer_pool_load_at_startup', value: 'ON' }
@@ -74,7 +74,7 @@
 - name: "{{ service_name }} | setup | mysql | Start Percona"
   ansible.builtin.service:
     name: mysql
-    state: started
+    state: restarted
 
 - name: "{{ service_name }} | setup | mysql | Create DB user '{{ service_user }}'" # noqa no-changed-when risky-shell-pipe
   ansible.builtin.shell: echo "CREATE USER IF NOT EXISTS '{{ service_user }}'@'localhost' IDENTIFIED BY '{{ service_user }}';" | mysql

diff --git a/tasks/setup/php.yaml b/tasks/setup/php.yaml
@@ -34,7 +34,7 @@
 - name: "{{ service_name }} | setup | php | Config PHP CLI"
   ansible.builtin.lineinfile:
     path: "/etc/php/{{ php_version }}/cli/php.ini"
-    regexp: "^{{ it.key }} ="
+    regexp: "^{{ it.key }}\\s*="
     line: "{{ it.key }} = {{ it.value }}"
   loop:
     - { key: 'max_execution_time', value: '300' }
@@ -50,7 +50,7 @@
   loop:
     - { key: 'post_max_size', value: '32M' }
     - { key: 'upload_max_filesize', value: '32M' }
-    - { key: 'memory_limit', value: '512M' }
+    - { key: 'memory_limit', value: '1G' }
   loop_control:
     label: "{{ it.key }}"
     loop_var: 'it'