aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2018-08-09 08:28:13 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2018-08-09 08:28:13 +0200
commitfe67b23917a17ec111788db6520ea3b6ca7a5422 (patch)
treee61d9a27d8b89c008c42cf20e48b8365cff75778
parentf55f5b028c7d37534db032dd81bafe9388ff9c6e (diff)
downloadinfra-fe67b23917a17ec111788db6520ea3b6ca7a5422.tar.gz
infra-fe67b23917a17ec111788db6520ea3b6ca7a5422.tar.bz2
infra-fe67b23917a17ec111788db6520ea3b6ca7a5422.tar.xz
infra-fe67b23917a17ec111788db6520ea3b6ca7a5422.zip
o Creating lxc-machine, adding systemd-timerd.
-rw-r--r--ansible/.gitignore1
-rw-r--r--ansible/connection_plugins/lxc_ssh.pycbin34788 -> 35058 bytes
-rw-r--r--ansible/mw.yml2
-rw-r--r--ansible/roles/lxc-machine/tasks/main.yml14
-rw-r--r--ansible/roles/mw-backend/tasks/main.yml9
5 files changed, 23 insertions, 3 deletions
diff --git a/ansible/.gitignore b/ansible/.gitignore
index 6fa6a9f..cc4e01f 100644
--- a/ansible/.gitignore
+++ b/ansible/.gitignore
@@ -4,3 +4,4 @@
vault-password
vault-password.asc
+*.pyc
diff --git a/ansible/connection_plugins/lxc_ssh.pyc b/ansible/connection_plugins/lxc_ssh.pyc
index 9696804..a76c18b 100644
--- a/ansible/connection_plugins/lxc_ssh.pyc
+++ b/ansible/connection_plugins/lxc_ssh.pyc
Binary files differ
diff --git a/ansible/mw.yml b/ansible/mw.yml
index 632d3a3..1ae18da 100644
--- a/ansible/mw.yml
+++ b/ansible/mw.yml
@@ -5,5 +5,5 @@
- secrets.yml
roles:
- timezone
+ - lxc-machine
- mw-backend
-
diff --git a/ansible/roles/lxc-machine/tasks/main.yml b/ansible/roles/lxc-machine/tasks/main.yml
new file mode 100644
index 0000000..24d64c8
--- /dev/null
+++ b/ansible/roles/lxc-machine/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+
+- name: system setup
+ tags:
+ - packages
+ block:
+ - name: misc packages
+ apt:
+ name: "{{ item }}"
+ install_recommends: no
+ with_items:
+ - systemd-cron
+
+# TODO: unattended upgrades, postfix client
diff --git a/ansible/roles/mw-backend/tasks/main.yml b/ansible/roles/mw-backend/tasks/main.yml
index 69f056d..5d04793 100644
--- a/ansible/roles/mw-backend/tasks/main.yml
+++ b/ansible/roles/mw-backend/tasks/main.yml
@@ -1,6 +1,6 @@
---
- name: apt setup
- tags:
+ tags:
- mw-backend
- packages
block:
@@ -32,7 +32,12 @@
- git
- etckeeper
- - name: packages
+- name: system setup
+ tags:
+ - mw-backend
+ - packages
+ block:
+ - name: misc packages
apt:
name: "{{ item }}"
install_recommends: no