Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tasks/automation-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
file:
dest: "{{ item }}"
state: "directory"
mode: '0755'
with_items:
- "/etc/archivematica/automation-tools"

Expand All @@ -67,6 +68,7 @@
src: "{{ item }}.j2"
dest: "/{{ item }}"
backup: "yes"
mode: '644'
with_items:
- "etc/archivematica/automation-tools/transfers.conf"
- "etc/archivematica/automation-tools/transfer-script.sh"
1 change: 1 addition & 0 deletions tasks/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
file:
state: "directory"
path: "{{ archivematica_src_dir }}"
mode: '0755'
when:
- (archivematica_src_install_am|bool or archivematica_src_install_ss|bool)

Expand Down
9 changes: 5 additions & 4 deletions tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
src: "{{ item }}"
dest: "/etc/rsyslog.d/archivematica.conf"
backup: "yes"
mode: '644'
with_first_found:
- files:
- "templates/{{ inventory_hostname }}/rsyslog.conf.j2"
Expand Down Expand Up @@ -42,19 +43,19 @@
become: yes
remote_user: "{{ archivematica_src_configure_ss_ssh_user | default('artefactual') }}"
register: archivematica_src_configure_ss_api_key_temp
when:
when:
- "archivematica_src_configure_dashboard|bool or archivematica_src_configure_ss|bool"
- "archivematica_src_configure_ss_api_key is undefined"
- ss_user.stdout != ""

- set_fact: archivematica_src_configure_ss_api_key="{{ archivematica_src_configure_ss_api_key_temp.stdout }}"
when:
when:
- "archivematica_src_configure_dashboard|bool"
- "archivematica_src_configure_ss_api_key_temp.stdout is defined"

# Create api-key if not defined and SS user was not already configured
- set_fact: archivematica_src_configure_ss_api_key={{ 999999999999999999999 | random | to_uuid | hash('md5') }}
when:
when:
- "archivematica_src_configure_ss_api_key is undefined"
- "archivematica_src_configure_ss|bool"

Expand Down Expand Up @@ -190,7 +191,7 @@
- archivematica_src_configure_dashboard|bool
- archivematica_src_configure_dashboardsettings is defined

# The rsync user is defined in the rsync_target, as user@host:/path
# The rsync user is defined in the rsync_target, as user@host:/path
- name: "Get rsync user for dip upload"
set_fact:
atom_dipupload_ssh_user: "{{ archivematica_src_configure_dashboardsettings['rsync_target'].split('@')[0] }}"
Expand Down
1 change: 1 addition & 0 deletions tasks/pipeline-clonecode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@
force: "yes"
accept_hostkey: "yes"
recursive: "no"
umask: '0022'
become_flags: "-ES"
7 changes: 6 additions & 1 deletion tasks/pipeline-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
src: "{{ item.src }}"
dest: "{{ item.dest }}"
backup: "yes"
mode: '644'
with_items:
- src: "etc/sysconfig/archivematica-mcp-server.j2"
dest: "{{ systemd_environment_path }}/archivematica-mcp-server"
Expand All @@ -45,6 +46,7 @@
src: "{{ item.src }}"
dest: "{{ item.dest }}"
backup: "yes"
mode: '644'
with_items:
- src: "etc/sysconfig/archivematica-mcp-client.j2"
dest: "{{ systemd_environment_path }}/archivematica-mcp-client"
Expand Down Expand Up @@ -96,6 +98,7 @@
src: "{{ item }}"
dest: /etc/archivematica/{{ item | basename | regex_replace('\.j2','') }}
backup: "yes"
mode: '644'
with_first_found:
- "templates/{{ inventory_hostname }}/dashboard.logging.json.j2"
- "templates/dashboard.logging.json.j2"
Expand All @@ -107,6 +110,7 @@
src: "{{ item }}"
dest: /etc/archivematica/{{ item | basename | regex_replace('\.j2','') }}
backup: "yes"
mode: '644'
with_first_found:
- "templates/{{ inventory_hostname }}/serverConfig.logging.json.j2"
- "templates/serverConfig.logging.json.j2"
Expand All @@ -118,6 +122,7 @@
src: "{{ item }}"
dest: /etc/archivematica/{{ item | basename | regex_replace('\.j2','') }}
backup: "yes"
mode: '644'
with_first_found:
- "templates/{{ inventory_hostname }}/clientConfig.logging.json.j2"
- "templates/clientConfig.logging.json.j2"
Expand Down Expand Up @@ -145,6 +150,7 @@
src: "{{ item.src }}"
dest: "{{ item.dest }}"
backup: "yes"
mode: '644'
when:
- "ansible_service_mgr == 'systemd'"
with_items:
Expand Down Expand Up @@ -192,4 +198,3 @@
- ansible_service_mgr == "systemd"
- archivematica_src_am_mcpclient_instances > 1
tags: amsrc-mcp-client

1 change: 1 addition & 0 deletions tasks/pipeline-instcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
backup: "yes"
force: "yes"
remote_src: "yes"
mode: '0644'

#
# front-end
Expand Down
1 change: 1 addition & 0 deletions tasks/pipeline-osconf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
file:
dest: "{{ item }}"
state: "directory"
mode: '0755'
with_items:
- "/usr/lib/archivematica"
- "/usr/share/archivematica"
Expand Down
4 changes: 3 additions & 1 deletion tasks/ss-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
virtualenv: "{{ archivematica_src_ss_virtualenv }}"
virtualenv_command: "{{ archivematica_src_virtualenv }}"
virtualenv_python: "{{ archivematica_src_virtualenv_python }}"
name:
name:
- "pip=={{ archivematica_src_pip_version }}"
- "pip-tools=={{ archivematica_src_pip_tools_version }}"
tags: "amsrc-ss-pydep"
Expand Down Expand Up @@ -147,6 +147,7 @@
file:
dest: "{{ item }}"
state: "directory"
mode: '0755'
with_items:
- "/etc/archivematica"
tags: "amsrc-ss-osconf"
Expand Down Expand Up @@ -202,6 +203,7 @@
backup: "yes"
force: "yes"
remote_src: "yes"
mode: '0644'
tags: "amsrc-ss-websrv"


Expand Down
1 change: 1 addition & 0 deletions tasks/ss-osconf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
src: "{{ item }}"
dest: "/etc/archivematica/storageService.logging.json"
backup: "yes"
mode: '644'
with_first_found:
- files:
- "templates/{{ inventory_hostname }}/storageService.logging.json.j2"
Expand Down