Compare commits

..

No commits in common. "64e34c8b9731c162dd820f0e795fd49c83ed4772" and "fc5cd0fe6a01f31e24d8ccc6c36b37ee54d7930a" have entirely different histories.

8 changed files with 11 additions and 40 deletions

View file

@ -7,7 +7,7 @@ admin_email_address: amarpreet@minhas.io
hashi_arch: amd64 hashi_arch: amd64
# consul # consul
consul_version: 1.9.7 consul_version: 1.9.4
consul_domain: masked.name consul_domain: masked.name
# vault # vault
@ -60,14 +60,14 @@ vault_ca_cert_payload: |
-----END CERTIFICATE----- -----END CERTIFICATE-----
# nomad # nomad
nomad_version: 1.1.1 nomad_version: 1.0.1
nomad_podman_driver_version: 0.1.0 nomad_podman_driver_version: 0.1.0
# podman # podman
podman_version: 3.0.1+dfsg1-3+b1 podman_version: 3.0.1+dfsg1-2+b1
# lnd # lnd
lnd_version: 0.13.1-beta lnd_version: 0.12.1-beta
# lego # lego
lego_version: 4.1.3 lego_version: 4.1.3

View file

@ -1,11 +0,0 @@
---
nomad_meta_values:
- { name: "storage_optimized", value: "false" }
- { name: "ram_optimized", value: "true" }
nomad_ug_map:
- { name: "jenkins", id: "15000" }
nomad_bind_mounts:
- { path: /opt/jenkins_home, owner: jenkins }
...

View file

@ -1,7 +1,6 @@
--- ---
nomad_meta_values: nomad_meta_values:
- { name: "storage_optimized", value: "true" } - { name: "long_lived", value: "true" }
- { name: "ram_optimized", value: "false" }
nomad_ug_map: nomad_ug_map:
- { name: "jenkins", id: "15000" } - { name: "jenkins", id: "15000" }

View file

@ -18,10 +18,9 @@ ivyking.minhas.io
[nomad_client] [nomad_client]
sedan.minhas.io sedan.minhas.io
ivyking.minhas.io
[nomad_server] [nomad_server]
ranger.minhas.io ivyking.minhas.io
[vault_server] [vault_server]
ivyking.minhas.io ivyking.minhas.io

View file

@ -87,14 +87,9 @@
check_mode: False check_mode: False
- name: get consul - name: get consul
unarchive: pkgng:
src: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_freebsd_amd64.zip" name: consul-{{ consul_version }}
dest: /usr/local/bin/ state: present
mode: 0755
owner: root
group: consul
remote_src: True
when: installed_consul_version.stdout != consul_version
- name: template consul config - name: template consul config
template: template:

View file

@ -105,7 +105,7 @@
name: "{{ item.name }} renewal" name: "{{ item.name }} renewal"
hour: "4" hour: "4"
user: lego user: lego
job: 'source /etc/default/lego && /usr/local/bin/lego --pem --path {{ lego_path }} --email {{ lego_email_address }} --dns {{ item.dns }} --domains "{{ item.domain }}" renew --days 45' job: 'source /etc/default/lego && /usr/local/bin/lego --pem --path {{ lego_path }} --email {{ lego_email_address }} --dns {{ item.dns }} --domains "{{ item.domain }}" renew --days 30'
loop: "{{ lego_certs }}" loop: "{{ lego_certs }}"
- name: create haproxy reload crontab - name: create haproxy reload crontab

View file

@ -24,17 +24,9 @@
state: stopped state: stopped
when: (lnd_binary.stat.exists == False) or (lnd_version != lnd_installed_version.stdout) when: (lnd_binary.stat.exists == False) or (lnd_version != lnd_installed_version.stdout)
- name: remove old lnd files
file:
name: "/home/bitcoind/go/bin/{{ item }}"
state: absent
with_items:
- lncli
- lnd
- name: update lnd - name: update lnd
unarchive: unarchive:
src: "https://github.com/lightningnetwork/lnd/releases/download/v{{ lnd_version }}/lnd-linux-{{ lnd_arch }}-v{{ lnd_version }}.tar.gz" src: 'https://github.com/lightningnetwork/lnd/releases/download/v{{ lnd_version }}/lnd-linux-{{ lnd_arch }}-v{{ lnd_version }}.tar.gz'
dest: /home/bitcoind/go/bin dest: /home/bitcoind/go/bin
owner: bitcoind owner: bitcoind
group: bitcoind group: bitcoind

View file

@ -5,7 +5,6 @@
gid: "{{ item.id }}" gid: "{{ item.id }}"
system: True system: True
loop: "{{ nomad_ug_map }}" loop: "{{ nomad_ug_map }}"
when: nomad_ug_map is defined
- name: setup user mappings - name: setup user mappings
user: user:
@ -13,7 +12,6 @@
uid: "{{ item.id }}" uid: "{{ item.id }}"
system: True system: True
loop: "{{ nomad_ug_map }}" loop: "{{ nomad_ug_map }}"
when: nomad_ug_map is defined
- name: ensure mounts - name: ensure mounts
file: file:
@ -23,5 +21,4 @@
group: "{{ item.owner }}" group: "{{ item.owner }}"
mode: 0755 mode: 0755
loop: "{{ nomad_bind_mounts }}" loop: "{{ nomad_bind_mounts }}"
when: nomad_bind_mounts is defined
... ...