diff --git a/roles/init-server/tasks/contingent/pkg/difftastic.yml b/roles/init-server/tasks/contingent/pkg/difftastic.yml index 84bc620..e169a7f 100644 --- a/roles/init-server/tasks/contingent/pkg/difftastic.yml +++ b/roles/init-server/tasks/contingent/pkg/difftastic.yml @@ -15,7 +15,7 @@ become: true ansible.builtin.file: src: "{{ ansible_user_home.stdout }}/downloads/archives/released/difftastic/{{ item }}" - dest: "/usr/local/bin/{{ item }}" + dest: "/usr/bin/{{ item }}" state: link loop: - difft diff --git a/roles/init-server/tasks/contingent/pkg/julia.yml b/roles/init-server/tasks/contingent/pkg/julia.yml index c9faecd..2283ad0 100644 --- a/roles/init-server/tasks/contingent/pkg/julia.yml +++ b/roles/init-server/tasks/contingent/pkg/julia.yml @@ -19,7 +19,7 @@ become: true ansible.builtin.file: src: "{{ ansible_user_home.stdout }}/.juliaup/bin/{{ item }}" - dest: "/usr/local/bin/{{ item }}" + dest: "/usr/bin/{{ item }}" owner: root group: root state: link diff --git a/roles/init-server/tasks/contingent/pkg/nvm.yml b/roles/init-server/tasks/contingent/pkg/nvm.yml index 21b03a6..bd8be17 100644 --- a/roles/init-server/tasks/contingent/pkg/nvm.yml +++ b/roles/init-server/tasks/contingent/pkg/nvm.yml @@ -20,7 +20,7 @@ - name: Linking binaries to directories already in PATH environment variable ansible.builtin.file: src: "{{ item[0] }}/bin/{{ item[1] }}" - dest: "/usr/local/bin/{{ item[1] }}" + dest: "/usr/bin/{{ item[1] }}" owner: root group: root state: link @@ -28,7 +28,7 @@ - name: Linking binaries to directories already in PATH environment variable ansible.builtin.file: src: "{{ item[0] }}/lib/node_modules/corepack/dist/{{ item[1] }}.js" - dest: "/usr/local/bin/{{ item[1] }}" + dest: "/usr/bin/{{ item[1] }}" owner: root group: root state: link @@ -36,7 +36,7 @@ - name: Linking binaries to directories already in PATH environment variable ansible.builtin.file: src: "{{ item[0] }}/lib/node_modules/npm/bin/{{ item[1] }}-cli.js" - dest: "/usr/local/bin/{{ item[1] }}" + dest: "/usr/bin/{{ item[1] }}" owner: root group: root state: link @@ -44,7 +44,7 @@ - name: Link includes to directories already recognized by system ansible.builtin.file: src: "{{ item[0] }}/include/{{ item[1] }}" - dest: "/usr/local/include/{{ item[1] }}" + dest: "/usr/include/{{ item[1] }}" owner: root group: root state: link @@ -52,14 +52,14 @@ - name: Link requisite libraries to directories already recognized by system ansible.builtin.file: src: "{{ item[0] }}/lib/{{ item[1] }}" - dest: "/usr/local/lib/{{ item[1] }}" + dest: "/usr/lib/{{ item[1] }}" owner: root group: root state: link loop: "{{ prebuilt_nodepaths | product(['node_modules']) }}" - name: Create man1 subdirectory for man pages ansible.builtin.file: - path: /usr/local/share/man/man1 + path: /usr/share/man/man1 recurse: true owner: root group: root @@ -68,14 +68,14 @@ - name: Link shared resources to directories already recognized by system ansible.builtin.file: src: "{{ item[0] }}/share/man/man1/{{ item[1] }}.1" - dest: "/usr/local/share/man/man1/{{ item[1] }}.1" + dest: "/usr/share/man/man1/{{ item[1] }}.1" owner: root group: root state: link loop: "{{ prebuilt_nodepaths | product(['node']) }}" - name: Create man1 subdirectory for man pages ansible.builtin.file: - path: /usr/local/share/doc + path: /usr/share/doc recurse: true owner: root group: root @@ -84,7 +84,7 @@ - name: Link shared resources to directories already recognized by system ansible.builtin.file: src: "{{ item[0] }}/share/doc/{{ item[1] }}" - dest: "/usr/local/share/doc/{{ item[1] }}" + dest: "/usr/share/doc/{{ item[1] }}" owner: root group: root state: link diff --git a/roles/init-server/tasks/contingent/pkg/radicle.yml b/roles/init-server/tasks/contingent/pkg/radicle.yml index 7351e06..b2efd26 100644 --- a/roles/init-server/tasks/contingent/pkg/radicle.yml +++ b/roles/init-server/tasks/contingent/pkg/radicle.yml @@ -21,7 +21,7 @@ - name: Linking binaries to directories already in PATH environment variable ansible.builtin.file: src: "{{ ansible_user_home.stdout }}/.radicle/bin/{{ item }}" - dest: "/usr/local/bin/{{ item }}" + dest: "/usr/bin/{{ item }}" state: link loop: - rad @@ -29,7 +29,7 @@ - git-remote-rad - name: Create man1 subdirectory for man pages ansible.builtin.file: - path: /usr/local/share/man/man1 + path: /usr/share/man/man1 recurse: true owner: root group: root @@ -38,7 +38,7 @@ - name: Link manpages to Linux manpage directories ansible.builtin.file: src: "{{ ansible_user_home.stdout }}/.radicle/man/man1/{{ item }}.1" - dest: "/usr/local/share/man/man1/{{ item }}.1" + dest: "/usr/share/man/man1/{{ item }}.1" state: link loop: - rad diff --git a/roles/init-server/tasks/contingent/pkg/rustup.yml b/roles/init-server/tasks/contingent/pkg/rustup.yml index 606684a..4a56538 100644 --- a/roles/init-server/tasks/contingent/pkg/rustup.yml +++ b/roles/init-server/tasks/contingent/pkg/rustup.yml @@ -19,7 +19,7 @@ become: true ansible.builtin.file: src: "{{ ansible_user_home.stdout }}/.cargo/bin/{{ item }}" - dest: "/usr/local/bin/{{ item }}" + dest: "/usr/bin/{{ item }}" state: link loop: - rustup diff --git a/roles/init-server/tasks/contingent/pkg/surge.yml b/roles/init-server/tasks/contingent/pkg/surge.yml index ca211d8..ea14874 100644 --- a/roles/init-server/tasks/contingent/pkg/surge.yml +++ b/roles/init-server/tasks/contingent/pkg/surge.yml @@ -8,7 +8,7 @@ become: true ansible.builtin.file: src: "{{ ansible_user_home.stdout }}/downloads/archives/released/surge/{{ item }}" - dest: "/usr/local/bin/{{ item }}" + dest: "/usr/bin/{{ item }}" state: link loop: - surge @@ -43,12 +43,11 @@ owner: "{{ ansible_user }}" group: "{{ ansible_user }}" mode: "644" - state: touch register: surge_token - name: Placing Surge API token into file on control node ansible.builtin.fetch: src: "{{ surge_token.dest }}" - dest: "/var/tmp/{{ inventory_hostname }}/surge.token" + dest: "./.tmp/{{ inventory_hostname }}-surge/surge.secret" flat: true - name: Informing control node of acquired files ansible.builtin.debug: diff --git a/roles/init-server/tasks/contingent/pkg/uv.yml b/roles/init-server/tasks/contingent/pkg/uv.yml index c11b8ad..e434cf1 100644 --- a/roles/init-server/tasks/contingent/pkg/uv.yml +++ b/roles/init-server/tasks/contingent/pkg/uv.yml @@ -19,7 +19,7 @@ become: true ansible.builtin.file: src: "{{ ansible_user_home.stdout }}/.local/bin/{{ item }}" - dest: "/usr/local/bin/{{ item }}" + dest: "/usr/bin/{{ item }}" state: link loop: - uv