diff --git a/README.md b/README.md index 16c84e313..6609743d8 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ * [Products](#products) * [Common](#common) + # Other useful pages - [Aurora Development Page](/docs/development.md) - [Molecule Docker Page](/docs/molecule_dockers.md) diff --git a/ansible/playbooks/install_software.yml b/ansible/playbooks/install_software.yml index 8e6c369b9..6e5937574 100644 --- a/ansible/playbooks/install_software.yml +++ b/ansible/playbooks/install_software.yml @@ -46,4 +46,4 @@ - {role: installation/mongodb, when: "'mongodb' in software_list"} - {role: installation/warehouse_ros, when: "'warehouse_ros' in software_list"} - {role: installation/production_tools, when: "'production_tools' in software_list"} - - {role: installation/teamviewer, when: "'teamviewer' in software_list"} + - {role: installation/shadow-support, when: "'shadow-support' in software_list"} diff --git a/ansible/roles/installation/teamviewer/defaults/main.yml b/ansible/roles/installation/shadow-support/defaults/main.yml similarity index 75% rename from ansible/roles/installation/teamviewer/defaults/main.yml rename to ansible/roles/installation/shadow-support/defaults/main.yml index 7dc4c91c5..b815336d1 100644 --- a/ansible/roles/installation/teamviewer/defaults/main.yml +++ b/ansible/roles/installation/shadow-support/defaults/main.yml @@ -13,5 +13,5 @@ # with this program. If not, see . --- -teamviewer_package_url: "https://download.teamviewer.com/download/linux/teamviewer_amd64.deb" -teamviewer_package_dest: "/tmp/teamviewer_amd64.deb" +shadow-support_package_url: "https://s3.eu-west-2.amazonaws.com/com.shadowrobot.eu-west-2.public/Shadow-Support-Binary/shadow-support-x86_64_external.deb" +shadow-support_package_dest: "/tmp/shadow-support.deb" diff --git a/ansible/roles/installation/teamviewer/tasks/main.yml b/ansible/roles/installation/shadow-support/tasks/main.yml similarity index 67% rename from ansible/roles/installation/teamviewer/tasks/main.yml rename to ansible/roles/installation/shadow-support/tasks/main.yml index 0b1302e48..bc59d51fd 100644 --- a/ansible/roles/installation/teamviewer/tasks/main.yml +++ b/ansible/roles/installation/shadow-support/tasks/main.yml @@ -12,21 +12,14 @@ # You should have received a copy of the GNU General Public License along # with this program. If not, see . ---- -- name: Install libminizip1 package (Dependency for TeamViewer) - become: true - apt: - name: libminizip1 - state: present -- name: Download TeamViewer package +- name: Download shadow-support package get_url: - url: "{{ teamviewer_package_url }}" - dest: "{{ teamviewer_package_dest }}" + url: "{{ shadow-support_package_url }}" + dest: "{{ shadow-support_package_dest }}" -- name: Install TeamViewer package +- name: Install shadow-support package become: true apt: - deb: "{{ teamviewer_package_dest }}" + deb: "{{ shadow-support_package_dest }}" state: present - diff --git a/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml b/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml index 52877df88..00276389e 100644 --- a/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml +++ b/ansible/roles/products/hand-e/docker-deploy/deploy/tasks/main.yml @@ -60,9 +60,9 @@ name: docker/aws when: use_aws|bool -- name: Include installation/teamviewer role +- name: Include installation/shadowsupport role include_role: - name: installation/teamviewer + name: installation/shadowsupport - name: Include docker-deploy/desktop-icons role include_role: diff --git a/ansible/roles/products/hand-e/server/deploy/tasks/main.yml b/ansible/roles/products/hand-e/server/deploy/tasks/main.yml index b5d7c1887..89ae469b4 100644 --- a/ansible/roles/products/hand-e/server/deploy/tasks/main.yml +++ b/ansible/roles/products/hand-e/server/deploy/tasks/main.yml @@ -194,6 +194,6 @@ mode: '755' when: upgrade_check|bool -- name: Include installation/teamviewer role +- name: Include installation/shadow-support role include_role: - name: installation/teamviewer + name: installation/shadow-support diff --git a/ansible/roles/products/teleop/server/deploy/tasks/main.yml b/ansible/roles/products/teleop/server/deploy/tasks/main.yml index 57a5ccd07..6bb2ebd61 100644 --- a/ansible/roles/products/teleop/server/deploy/tasks/main.yml +++ b/ansible/roles/products/teleop/server/deploy/tasks/main.yml @@ -229,6 +229,6 @@ mode: '755' when: upgrade_check|bool -- name: Include installation/teamviewer role +- name: Include installation/shadow-support role include_role: - name: installation/teamviewer \ No newline at end of file + name: installation/shadow-support \ No newline at end of file