diff options
| -rw-r--r-- | ansible/elasticsearch.yml | 12 | ||||
| -rw-r--r-- | ansible/host_vars/numquam/elasticsearch.yml | 6 | ||||
| -rw-r--r-- | ansible/host_vars/numquam/packages.yml | 2 | ||||
| -rw-r--r-- | ansible/host_vars/numquam/postfix-secret.yml | 11 | ||||
| -rw-r--r-- | ansible/inventory | 3 | ||||
| -rw-r--r-- | ansible/numquam.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/packages/tasks/main.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/trygvis-base/defaults/main.yml | 10 | ||||
| -rw-r--r-- | ansible/roles/trygvis-base/handlers/main.yml | 2 |
9 files changed, 40 insertions, 11 deletions
diff --git a/ansible/elasticsearch.yml b/ansible/elasticsearch.yml index 670bbe1..6b05ce7 100644 --- a/ansible/elasticsearch.yml +++ b/ansible/elasticsearch.yml @@ -16,6 +16,18 @@ group: elasticsearch mode: u=rwx,go=rx + - name: /etc/default/elasticsearch + become: yes + copy: + dest: /etc/default/elasticsearch + content: "" + force: no + - become: yes + lineinfile: + dest: /etc/default/elasticsearch + line: "ES_PATH_CONF=/etc/elasticsearch" + regexp: "ES_PATH_CONF" + - hosts: - elasticsearch-servers roles: diff --git a/ansible/host_vars/numquam/elasticsearch.yml b/ansible/host_vars/numquam/elasticsearch.yml new file mode 100644 index 0000000..cc12cd0 --- /dev/null +++ b/ansible/host_vars/numquam/elasticsearch.yml @@ -0,0 +1,6 @@ +elasticsearch__state: present +elasticsearch__data_dir: /opt/elasticsearch/data +elasticsearch__http_port: 9201 +elasticsearch__tcp_port: 9301 + +es_heap_size: 512m diff --git a/ansible/host_vars/numquam/packages.yml b/ansible/host_vars/numquam/packages.yml new file mode 100644 index 0000000..8d2269c --- /dev/null +++ b/ansible/host_vars/numquam/packages.yml @@ -0,0 +1,2 @@ +packages__enable_backports: yes +packages__version: stretch diff --git a/ansible/host_vars/numquam/postfix-secret.yml b/ansible/host_vars/numquam/postfix-secret.yml new file mode 100644 index 0000000..acdea4d --- /dev/null +++ b/ansible/host_vars/numquam/postfix-secret.yml @@ -0,0 +1,11 @@ +$ANSIBLE_VAULT;1.1;AES256 +36616532346137636533653465363930646133636565366464636335313435316264343165306538 +3365633433306637633766643733363134336531643931360a383036613237613335303139653264 +31666161353837366632616232393739663363373234386537633066636161373265663633396637 +6265623735313735630a363634366133343664656338613164363333323035396361363438636136 +64653432396237393832616161613261303436343564653565343839383339313235383762613661 +62386237663737396336623761646338383838363930636136643238626631636634363130323063 +30393962653462343539643763623461626239636636663735343138396334396364393730656664 +34326234333766306266386231386263613263343635316136363961623833323061656239623338 +34313935336164303533333761333136633535343432333839396634656630323434336531656535 +3539316239323839336365623031303465366563613632326233 diff --git a/ansible/inventory b/ansible/inventory index 990b299..9b9ff78 100644 --- a/ansible/inventory +++ b/ansible/inventory @@ -29,7 +29,7 @@ all: akysis: elasticsearch-servers: hosts: - fuckaduck: + numquam: sbcs: hosts: homepi: @@ -39,6 +39,7 @@ all: nextcloud: homepi: malabaricus: + numquam: lxc-hosts: hosts: birgitte: diff --git a/ansible/numquam.yml b/ansible/numquam.yml index c75987f..eb98aaa 100644 --- a/ansible/numquam.yml +++ b/ansible/numquam.yml @@ -18,10 +18,6 @@ import_role: name=postgresql-server tags: postgresql-server become: yes - - name: java8 - import_role: name=java8 - tags: java8 - become: yes - name: rosin import_role: name=rosin tags: rosin diff --git a/ansible/roles/packages/tasks/main.yml b/ansible/roles/packages/tasks/main.yml index 45077cc..53ebf20 100644 --- a/ansible/roles/packages/tasks/main.yml +++ b/ansible/roles/packages/tasks/main.yml @@ -38,6 +38,7 @@ - name: Enable backports repository by default when: packages__enable_backports + become: yes copy: dest: /etc/apt/preferences.d/bitraf-packages content: | diff --git a/ansible/roles/trygvis-base/defaults/main.yml b/ansible/roles/trygvis-base/defaults/main.yml index f469304..8244bbf 100644 --- a/ansible/roles/trygvis-base/defaults/main.yml +++ b/ansible/roles/trygvis-base/defaults/main.yml @@ -1,7 +1,7 @@ -bitraf_base__etc_localtime: yes -bitraf_base__remove_root_authorized_keys: yes -bitraf_base__fix_aliases: yes +trygvis_base__etc_localtime: yes +trygvis_base__remove_root_authorized_keys: yes +trygvis_base__fix_aliases: yes # These mostly applies to LXC hosts -bitraf_base__fix_hosts: no -bitraf_base__syslog: no +trygvis_base__fix_hosts: no +trygvis_base__syslog: no diff --git a/ansible/roles/trygvis-base/handlers/main.yml b/ansible/roles/trygvis-base/handlers/main.yml index c0b601c..f06ad24 100644 --- a/ansible/roles/trygvis-base/handlers/main.yml +++ b/ansible/roles/trygvis-base/handlers/main.yml @@ -4,4 +4,4 @@ - name: postalias /etc/aliases become: yes - shell: "[ -x /usr/sbin/postalias ] && /usr/sbin/postalias /etc/aliases" + shell: "[ ! -x /usr/sbin/postalias ] || /usr/sbin/postalias /etc/aliases" |