summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-10-20 22:09:23 +0300
committerLars Wirzenius <liw@liw.fi>2017-10-20 22:09:23 +0300
commitad01ef6ee3d360d6fd01a09081b7d216be4b2380 (patch)
tree618a2e6a6d84d242a4a63d8112cd95d6464fe82e
parent7ae7342b43f4087a16cb0def17d199e4aced238d (diff)
downloadansibleness-ad01ef6ee3d360d6fd01a09081b7d216be4b2380.tar.gz
Drop: obnam stuff
-rw-r--r--ansible/hosts5
-rw-r--r--ansible/obbench.yml13
-rwxr-xr-xansible/populate-pieni1
-rw-r--r--ansible/roles/obnam-benchmarker/tasks/main.yml12
-rw-r--r--ansible/roles/obnam-client/files/obnam-backup14
-rw-r--r--ansible/roles/obnam-client/tasks/main.yml81
-rw-r--r--ansible/roles/obnam-client/templates/obnam.yaml.j225
-rw-r--r--ansible/roles/obnam-dev-env/tasks/main.yml11
8 files changed, 0 insertions, 162 deletions
diff --git a/ansible/hosts b/ansible/hosts
index fb546e9..83e1a8e 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -5,7 +5,6 @@ exolobe2
exolobe3
debmirror
leonard hostname=leonard debian_codename=stretch
-e2obbench
ext-ick-unstable-amd64 hostname=ick-unstable-amd64 debian_codename=unstable
ext-ick-unstable-i386 hostname=ick-unstable-i386 debian_codename=unstable
ext-ick-debian8-i386 hostname=ick-debian8-i386 debian_codename=jessie
@@ -20,9 +19,6 @@ ick2dev
vmdb2dev
ick2host
-[obbench]
-e2obbench
-
[infinland]
willikins
holywood
@@ -30,7 +26,6 @@ exolobe2
exolobe3
debmirror
leonard
-e2obbench
ext-ick-unstable-amd64
ext-ick-unstable-i386
ext-ick-debian8-i386
diff --git a/ansible/obbench.yml b/ansible/obbench.yml
deleted file mode 100644
index 6d27c85..0000000
--- a/ansible/obbench.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-- hosts: e2obbench
- remote_user: ansible
- become: yes
- roles:
- - code.liw.fi-using-apt
- - sane_debian_system
- - liw-usual
- - version-controller
- - python-dev-env
- - debian-dev-env
- - obnam-dev-env
- - obnam-benchmarker
- - self-updating-system
diff --git a/ansible/populate-pieni b/ansible/populate-pieni
index 907f5a5..8fed32b 100755
--- a/ansible/populate-pieni
+++ b/ansible/populate-pieni
@@ -44,7 +44,6 @@ rsync_hrun_to_addr liw:liw /home/liw/.bogofilter /home/liw/.bogofilter
rsync_hrun_to_addr liw:liw /home/liw/.irssi /home/liw/.irssi
rsync_hrun_to_addr liw:liw /home/liw/whitelist /home/liw/whitelist
rsync_hrun_to_addr liw:liw /home/liw/killfile /home/liw/killfile
-rsync_hrun_to_addr obbench:obbench /home/obbench/benchmark/. /srv/http/benchmark.obnam.org/.
rsync_hrun_to_addr yakking:yakking /home/yakking/bin /home/yakking/bin
rsync_hrun_to_addr yakking:yakking /home/yakking/fracking /home/yakking/fracking
rsync_hrun_to_addr yakking:yakking /home/yakking/publish-yakking /home/yakking/publish-yakkina
diff --git a/ansible/roles/obnam-benchmarker/tasks/main.yml b/ansible/roles/obnam-benchmarker/tasks/main.yml
deleted file mode 100644
index 19bb467..0000000
--- a/ansible/roles/obnam-benchmarker/tasks/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: install obbench ssh private key for user liw
- synchronize:
- src: /home/liw/.ssh/keypairs/liw-at-obbench.key
- dest: /home/liw/.ssh/id_rsa
- archive: yes
-- name: install obbench ssh public key for user liw
- synchronize:
- src: /home/liw/.ssh/keypairs/liw-at-obbench.key.pub
- dest: /home/liw/.ssh/id_rsa.pub
- archive: yes
-...
diff --git a/ansible/roles/obnam-client/files/obnam-backup b/ansible/roles/obnam-client/files/obnam-backup
deleted file mode 100644
index 25fca95..0000000
--- a/ansible/roles/obnam-client/files/obnam-backup
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-run_obnam()
-{
- nice -n19 ionice -c3 obnam "$@"
-}
-
-run_obnam force-lock || true
-run_obnam backup
-run_obnam forget
-
-echo "Backup finished OK"
diff --git a/ansible/roles/obnam-client/tasks/main.yml b/ansible/roles/obnam-client/tasks/main.yml
deleted file mode 100644
index 29137c3..0000000
--- a/ansible/roles/obnam-client/tasks/main.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-- name: install packages for backups
- apt:
- name: "{{ item }}"
- with_items:
- - moreutils # for chronic
- - obnam
-
-- name: create /etc/obnam
- file:
- state: directory
- path: /etc/obnam
- owner: root
- group: root
- mode: 0755
-
-- name: install obnam config
- template:
- src: obnam.yaml.j2
- dest: /etc/obnam/obnam.yaml
- owner: root
- group: root
- mode: 0644
-
-- name: install ssh private key for backups
- copy:
- content: "{{ lookup('pipe', 'pass show ' + obnam_ssh_key) }}"
- dest: /etc/obnam/backup.key
- owner: root
- group: root
- mode: 0600
-
-- name: install ssh keys for backups
- copy:
- content: "{{ lookup('pipe', 'pass show ' + obnam_ssh_key + '.pub') }}"
- dest: /etc/obnam/backup.key.pub
- owner: root
- group: root
- mode: 0644
-
-- name: make sure host key for backup server is known
- shell: |
- host="$(python -c 'import urlparse, sys; print urlparse.urlparse(sys.argv[1]).netloc.split("@",1)[-1]' {{ obnam_repository }})"
- ssh-keyscan "$host" > /etc/ssh/ssh_known_hosts
-
-- name: copy over OpenPGP private key for backup encryption
- copy:
- content: "{{ lookup('pipe', 'pass show ' + obnam_pgp_key) }}"
- dest: /root/backup.key
- owner: root
- group: root
- mode: 0600
-
-- name: copy over OpenPGP public key for backup encryption
- copy:
- content: "{{ lookup('pipe', 'pass show ' + obnam_pgp_key + '.pub') }}"
- dest: /root/backup.key.pub
- owner: root
- group: root
- mode: 0600
-
-- name: install OpenPGP key pair for backup encryption
- shell: |
- gpg --import /root/backup.key
- gpg --import /root/backup.key.pub
- rm /root/backup.key /root/backup.key.pub
-
-- name: install wrapper script for Obnam
- copy:
- src: obnam-backup
- dest: /usr/local/sbin/obnam-backup
- owner: root
- group: root
- mode: 0755
-
-- name: set up cron job to run backups
- cron:
- cron_file: local-backups
- user: root
- name: "backups to remote server"
- special_time: daily
- job: "chronic flock /root/backup.lock /usr/local/sbin/obnam-backup"
diff --git a/ansible/roles/obnam-client/templates/obnam.yaml.j2 b/ansible/roles/obnam-client/templates/obnam.yaml.j2
deleted file mode 100644
index 0a68fb6..0000000
--- a/ansible/roles/obnam-client/templates/obnam.yaml.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-config:
- one-file-system: yes
- exclude-caches: yes
- weak-random: yes
- leave-checkpoints: yes
- log: /var/log/obnam.log
- log-level: debug
- log-max: 200m
- log-keep: 2
-
- lru-size: 1024
- upload-queue-size: 512
-
- repository: "{{ obnam_repository }}"
- ssh-key: /etc/obnam/backup.key
- keep: "{{ obnam_keep_policy }}"
- root:
-{% for item in obnam_live_roots %}
- - {{ item }}
-{% endfor %}
-
- exclude:
-{% for item in obnam_excludes %}
- - {{ item }}
-{% endfor %}
diff --git a/ansible/roles/obnam-dev-env/tasks/main.yml b/ansible/roles/obnam-dev-env/tasks/main.yml
deleted file mode 100644
index 5911846..0000000
--- a/ansible/roles/obnam-dev-env/tasks/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: install python-larch
- apt: name=python-larch
-
-- name: install genbackupdata
- apt: name=genbackupdata
-
-- name: install summain
- apt: name=summain
-
-- name: install attr
- apt: name=attr