Skip to content

Commit

Permalink
make dist changes ready for pr
Browse files Browse the repository at this point in the history
  • Loading branch information
alf-cactus committed Sep 11, 2024
1 parent 33a9382 commit 0bb575b
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 12 deletions.
1 change: 0 additions & 1 deletion inventory/group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ lib_tmp_dir: "{{ fworch_home }}/lib/tmp"

### password generation
randomly_generated_pwd: "{{ lookup('password', '/dev/null length=32 chars=ascii_letters') }}"
main_key_for_testing: "not4production..not4production.."

### logging
syslog_proto: tcp
Expand Down
6 changes: 2 additions & 4 deletions roles/finalize/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,16 @@
paths: /etc/cron.d
patterns: "{{ product_name }}_sample_data_*"
register: files_to_delete
when: demo_data_present.query_result == []
become: true
when: "'sampleserver' in group_names"
when: "demo_data_present.query_result == [] and 'sampleserver' in group_names"

- name: delete cron jobs in case of missing demo data
file:
path: "{{ item.path }}"
state: absent
with_items: "{{ files_to_delete.files }}"
when: demo_data_present.query_result == []
become: true
when: "'sampleserver' in group_names"
when: "demo_data_present.query_result == [] and 'sampleserver' in group_names"

- name: remove temp importer_password from install host
file:
Expand Down
13 changes: 11 additions & 2 deletions roles/lib/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,23 @@
- name: install wkhtml pdf library needed for both ui and middleware servers
include_tasks: install_wkhtml_pdf.yml

#todo: are permissions ok?
- name: copy {{ product_name }} dotnet lib files to lib target
- name: copy {{ product_name }} dotnet lib files to lib target (localhost)
synchronize:
src: "./"
dest: "{{ lib_dir }}"
rsync_opts:
- "--chown={{ fworch_user }}:{{ fworch_group }}"
tags: [ 'test' ]
when: inventory_hostname == 'localhost'

- name: copy {{ product_name }} dotnet lib files to lib target (remote)
copy:
src: "./"
dest: "{{ lib_dir }}"
owner: "{{ fworch_user }}"
group: "{{ fworch_group }}"
tags: [ 'test' ]
when: inventory_hostname != 'localhost'

- name: finalize handler for datarecovery
set_fact:
Expand Down
3 changes: 0 additions & 3 deletions roles/test/tasks/test-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@
delay: 5 # Every 5 seconds
when: "'frontends' in group_names"

#########################
# ui_hostname ist einfach 'ui-srv' aus hosts. Funktioniert das ohne IP Adresse?

- name: show ui webserver test results
fail:
msg: "url: {{ web_call_result.url }}, status: {{ web_call_result.status }}"
Expand Down
13 changes: 11 additions & 2 deletions roles/ui/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,23 @@
owner: "{{ fworch_user }}"
group: "{{ fworch_group }}"

#todo: are permissions ok?
- name: copy ui files to frontend target
- name: copy ui files to frontend target (localhost)
synchronize:
src: "FWO.UI"
dest: "{{ ui_dir }}"
rsync_opts:
- "--chown={{ fworch_user }}:{{ fworch_group }}"
tags: [ 'test' ]
when: inventory_hostname == 'localhost'

- name: copy ui files to frontend target (remote)
copy:
src: "FWO.UI"
dest: "{{ ui_dir }}"
owner: "{{ fworch_user }}"
group: "{{ fworch_group }}"
tags: [ 'test' ]
when: inventory_hostname != 'localhost'

become: true

Expand Down

0 comments on commit 0bb575b

Please sign in to comment.