diff --git a/ansible.cfg b/ansible.cfg index 8cbdaf0a93eed794ae9b821f35bb63aaa590b59b..8e53c342a7a8aa29ca33a4f3a99a9e9b3b321602 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -5,5 +5,6 @@ command_warnings = false remote_user = adamsmith become = yes become_method = sudo -private_key_file = ~/.ssh/id_ed25519 +#private_key_file = ~/.ssh/id_ed25519 +private_key_file = ~/.ssh/id_rsa vault_password_file = offline/vaultpass diff --git a/group_vars/stations/eci_passwd.yml b/group_vars/stations/eci_passwd.yml deleted file mode 100644 index d34cc96300a32c1eb31c38b694aa9d346d331edc..0000000000000000000000000000000000000000 --- a/group_vars/stations/eci_passwd.yml +++ /dev/null @@ -1,14 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -38663730396439656433653635663733316634373937616238396637313531393634386531323737 -3662353666383130303532613831373566663665366231610a343838356261363133326164316461 -63613734633732373962646238656461336636356662396162623330623466383035643362616335 -6239396336613136330a316231663561323463303232363739616339343937313332386431376130 -32343330633336316463306262373330623430323761373635353136363732313263663765333431 -31373864383461356565643732323231663063333566663231323263626530363836323161663236 -34353637616363393233643164363563356139343935353732616132316562393261636339663761 -32346233376637633234396366363738346631613465356534376634373032616231353165396239 -39343964646164303534333262396132353064353432336533396465633966303965363466623937 -62343666613436343734356636326231353462643436656466636362353139323130666534646635 -36323165303666663331386337663265363261306361343839363337386664616434396263393838 -34346630313839636235663233343832376431386664376636353930613862653561666137653231 -38663262373331383134346534656264393735326562326537313464393464616561 diff --git a/hosts.txt b/hosts.txt index fec5819f3b8d207dadb98b041565c8970e850e54..a2f07e483ab834781ef0b8fe800dcaafe1cfd8cd 100644 --- a/hosts.txt +++ b/hosts.txt @@ -1,6 +1,6 @@ [stations] pf0320 ansible_host=10.184.166.26 -#pf0323 ansible_host=10.184.167.12 +pf0323 ansible_host=10.184.167.12 #pf0320 ansible_host=10.184.166.17 #pf0322 ansible_host=10.184.166.19 [all:vars] diff --git a/roles/pb_extras_fetcher/handlers/main.yml b/roles/pb_extras_fetcher/handlers/main.yml index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a4db787a1013d705d9644cd80db33f53ee96d696 100644 --- a/roles/pb_extras_fetcher/handlers/main.yml +++ b/roles/pb_extras_fetcher/handlers/main.yml @@ -0,0 +1,4 @@ +- name: Reload systemd daemons. + listen: daemon-reload + ansible.builtin.systemd: + daemon-reload: yes diff --git a/roles/pb_extras_fetcher/tasks/main.yml b/roles/pb_extras_fetcher/tasks/main.yml index 133418e876ee6f65a8014cf5da7f5dc1d4e5b440..f03cc648d5c4595abfc856465843d299eeefbba1 100644 --- a/roles/pb_extras_fetcher/tasks/main.yml +++ b/roles/pb_extras_fetcher/tasks/main.yml @@ -1,4 +1,5 @@ -- name: Create /eci-users/proxer/pb_extras_fetcher .. +- name: Create /eci-users/proxer/pb_extras_fetcher . + tags: pb_extras_fetcher ansible.builtin.file: path: /eci-users/proxer/pb_extras_fetcher state: directory @@ -6,6 +7,7 @@ group: eci - name: Create /eci-users/proxer/pubchem_extras . + tags: pb_extras_fetcher ansible.builtin.file: path: /eci-users/proxer/pubchem_extras state: directory @@ -13,12 +15,15 @@ group: eci - name: Clone pb_extras_fetcher. + tags: pb_extras_fetcher become_user: proxer ansible.builtin.git: dest: /eci-users/proxer/pb_extras_fetcher repo: https://gitlab.lcsb.uni.lu/eci/pb_extras_fetcher.git - name: Copy service files. + tags: pb_extras_fetcher + notify: daemon-reload ansible.builtin.copy: remote_src: yes src: "/eci-users/proxer/pb_extras_fetcher{{ item }}" @@ -27,18 +32,19 @@ - /etc/systemd/system/pb_extras_fetcher.service - /etc/systemd/system/pb_extras_fetcher.timer -# - name: Restart and enable pb_extras_fetcher. -# ansible.builtin.systemd: -# name: pb_extras_fetcher.service -# state: started -# daemon-reload: yes -# enabled: yes -# - name: Start the timer. -# ansible.builtin.systemd: -# name: pb_extras_fetcher.timer -# daemon-reload: yes -# enabled: yes +- name: Restart pb_extras_fetcher.service + tags: pb_extras_fetcher + ansible.builtin.systemd: + name: pb_extras_fetcher.service + state: stopped + enabled: yes +- name: Enable pb_extras_fetcher.timer + tags: pb_extras_fetcher + ansible.builtin.systemd: + name: pb_extras_fetcher.timer + state: started + enabled: yes diff --git a/roles/shinyproxy/files/eci-users/proxer/addusers.py b/roles/shinyproxy/files/eci-users/proxer/addusers.py old mode 100644 new mode 100755 index f36e0543c73103990f1605ebc29e2cc1d0d336d6..11de06d5f6ec1bca53f1cce639dbc79937fddeb4 --- a/roles/shinyproxy/files/eci-users/proxer/addusers.py +++ b/roles/shinyproxy/files/eci-users/proxer/addusers.py @@ -1,7 +1,7 @@ +#!/usr/bin/env python3 import yaml import os - fn_passwd="eci_passwords.yml" fn_application="application.in.yml" fn_users="eci_users.yml" diff --git a/roles/shinyproxy/tasks/main.yml b/roles/shinyproxy/tasks/main.yml index b45ed3011fab9d4cd4a64b09f46051361252aae7..6886841eedbe9d0a75c82592ab2862d3b1fc4ef6 100644 --- a/roles/shinyproxy/tasks/main.yml +++ b/roles/shinyproxy/tasks/main.yml @@ -81,8 +81,8 @@ mode: '0644' - name: Load docker image. - ansible.builtin.shell: - cmd: docker load -i docker-shinyscreen.tar.gz && touch loaded.shinyscreen + shell: docker load -i docker-shinyscreen.tar.gz && touch loaded.shinyscreen + args: creates: loaded.shinyscreen chdir: /eci-users/proxer @@ -114,7 +114,7 @@ cmd: files/eci-users/proxer/addusers.py chdir: /eci-users/proxer executable: python3 - + - name: Copy shinyproxy script. tags: shinyproxy-conf notify: shinyproxy-service