Skip to content

Commit

Permalink
revert 4387cfe for now, sorry / new re-create task / change in molecu…
Browse files Browse the repository at this point in the history
…le.yml
  • Loading branch information
stefangweichinger committed Aug 2, 2024
2 parents f9a1709 + 4387cfe commit 92ddaea
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
3 changes: 0 additions & 3 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ rclone_fact_path: "/etc/ansible/facts.d/rclone.fact"

install_manpages: true

# Defaults in case no variables for OS are chosen
rclone_setup_tmp_dir: "/tmp/rclone_setup"

# The location to install manpages
rclone_manpages_location: "{{ default_rclone_manpages_location }}"

Expand Down
3 changes: 3 additions & 0 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ platforms:
command: ${MOLECULE_DOCKER_COMMAND:-""}
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:rw
tmpfs:
- /run
- /tmp
cgroupns_mode: host
privileged: true
pre_build_image: true
Expand Down
4 changes: 2 additions & 2 deletions tasks/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
- name: Get rclone beta version
ansible.builtin.unarchive:
src: "{{ beta_version_url | default('https://beta.rclone.org/v' + rclone_version + '/rclone-v' + rclone_version + '-linux-' + rclone_arch + '.zip') }}"
dest: "{{ rclone_setup_tmp_dir }}"
dest: "{{ rclone_setup_tmp_dir.path }}"
remote_src: true
mode: 0744
list_files: true
creates: "{{ rclone_setup_tmp_dir }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}"
creates: "{{ rclone_setup_tmp_dir.path }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}"
6 changes: 3 additions & 3 deletions tasks/install-bin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@

- name: Get list of files extracted from the rclone archive
ansible.builtin.find:
path: "{{ rclone_setup_tmp_dir }}"
path: "{{ rclone_setup_tmp_dir.path }}"
depth: 2
file_type: directory
register: rclone_archive

- name: Copy rclone binary
ansible.builtin.copy:
src: "{{ rclone_setup_tmp_dir }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}/rclone"
src: "{{ rclone_setup_tmp_dir.path }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}/rclone"
dest: '{{ rclone_binary_location }}'
mode: '0755'
owner: '{{ rclone_binary_owner.OWNER }}'
Expand All @@ -62,7 +62,7 @@

- name: Copy rclone manpage
ansible.builtin.copy:
src: "{{ rclone_setup_tmp_dir }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}/rclone.1"
src: "{{ rclone_setup_tmp_dir.path }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}/rclone.1"
dest: "{{ rclone_manpages_location }}/rclone.1"
mode: '0644'
owner: '{{ rclone_manpages_owner.OWNER }}'
Expand Down
4 changes: 2 additions & 2 deletions tasks/stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- name: Get rclone stable version {{ rclone_version }}
ansible.builtin.unarchive:
src: https://downloads.rclone.org/v{{ rclone_version }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}.zip
dest: "{{ rclone_setup_tmp_dir }}"
dest: "{{ rclone_setup_tmp_dir.path }}"
remote_src: true
mode: 0744
creates: "{{ rclone_setup_tmp_dir }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}"
creates: "{{ rclone_setup_tmp_dir.path }}/rclone-v{{ rclone_version }}-linux-{{ rclone_arch }}"

0 comments on commit 92ddaea

Please sign in to comment.