summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-10-23 00:51:27 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-10-23 00:51:27 +0200
commit2a34c65fc5cba90af9c5776fb01a73934f0ce362 (patch)
tree65cee55cfc05ddccb9dab101ea67b7f43dd565af /roles
parentkubernetes/standalone: make sure bridge exists before setting sysctl property (diff)
move nodejs apt-repo to separate role
Diffstat (limited to 'roles')
-rw-r--r--roles/apt-repo/nodejs/files/repo.gpg (renamed from roles/elevate/liquidtruth/files/nodesource.gpg)bin2206 -> 2206 bytes
-rw-r--r--roles/apt-repo/nodejs/tasks/main.yml19
-rw-r--r--roles/elevate/liquidtruth/tasks/main.yml2
-rw-r--r--roles/elevate/liquidtruth/tasks/nodejs.yml21
4 files changed, 23 insertions, 19 deletions
diff --git a/roles/elevate/liquidtruth/files/nodesource.gpg b/roles/apt-repo/nodejs/files/repo.gpg
index 4f3ec4ed..4f3ec4ed 100644
--- a/roles/elevate/liquidtruth/files/nodesource.gpg
+++ b/roles/apt-repo/nodejs/files/repo.gpg
Binary files differ
diff --git a/roles/apt-repo/nodejs/tasks/main.yml b/roles/apt-repo/nodejs/tasks/main.yml
new file mode 100644
index 00000000..25f892bf
--- /dev/null
+++ b/roles/apt-repo/nodejs/tasks/main.yml
@@ -0,0 +1,19 @@
+---
+- name: add repository key
+ copy:
+ src: repo.gpg
+ dest: /etc/apt/trusted.gpg.d/nodejs.gpg
+ register: apt_repo_nodejs_key
+
+- name: add repository entry
+ copy:
+ content: |
+ deb https://deb.nodesource.com/node_10.x {{ ansible_distribution_release }} main
+ dest: /etc/apt/sources.list.d/nodejs.list
+ register: apt_repo_nodejs_sources
+
+- name: update apt cache
+ when: apt_repo_nodejs_key is changed or
+ apt_repo_nodejs_sources is changed
+ apt:
+ update_cache: yes
diff --git a/roles/elevate/liquidtruth/tasks/main.yml b/roles/elevate/liquidtruth/tasks/main.yml
index 4cb50dc9..284c50bc 100644
--- a/roles/elevate/liquidtruth/tasks/main.yml
+++ b/roles/elevate/liquidtruth/tasks/main.yml
@@ -10,7 +10,7 @@
fstype: xfs
dev: "/dev/mapper/{{ host_name | replace('-', '--') }}-srv"
-- name: mount filesytem
+- name: mount filesystem
mount:
src: "/dev/mapper/{{ host_name | replace('-', '--') }}-srv"
path: /srv
diff --git a/roles/elevate/liquidtruth/tasks/nodejs.yml b/roles/elevate/liquidtruth/tasks/nodejs.yml
index 2ef1db34..667f4a71 100644
--- a/roles/elevate/liquidtruth/tasks/nodejs.yml
+++ b/roles/elevate/liquidtruth/tasks/nodejs.yml
@@ -1,22 +1,7 @@
---
-- name: add repository key
- copy:
- src: nodesource.gpg
- dest: /etc/apt/trusted.gpg.d/nodejs.gpg
- register: apt_repo_nodejs_key
-
-- name: add repository entry
- copy:
- content: |
- deb https://deb.nodesource.com/node_10.x {{ ansible_distribution_release }} main
- dest: /etc/apt/sources.list.d/nodejs.list
- register: apt_repo_nodejs_sources
-
-- name: update apt cache
- when: apt_repo_nodejs_key is changed or
- apt_repo_nodejs_sources is changed
- apt:
- update_cache: yes
+- name: add nodejs repo
+ import_role:
+ name: apt-repo/nodejs
- name: install nodejs
apt: