diff options
author | Lars Wirzenius <liw@liw.fi> | 2017-02-24 17:51:15 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2017-02-24 17:51:15 +0200 |
commit | 5d6b40219191332483c246538f585b17cf5ed7b7 (patch) | |
tree | 47f3c419ac3baa3b3d0d3d66c1749f1836623c42 | |
parent | c6fc3050190e1b119063d1dfeb537bebdcec433d (diff) | |
download | ansibleness-5d6b40219191332483c246538f585b17cf5ed7b7.tar.gz |
Move vars out from debmirror.yml
-rw-r--r-- | ansible/debmirror.yml | 11 | ||||
-rw-r--r-- | ansible/group_vars/infinland.yml | 4 | ||||
-rw-r--r-- | ansible/host_vars/debmirror.yml | 2 |
3 files changed, 6 insertions, 11 deletions
diff --git a/ansible/debmirror.yml b/ansible/debmirror.yml index b68ff34..87553ce 100644 --- a/ansible/debmirror.yml +++ b/ansible/debmirror.yml @@ -1,17 +1,6 @@ - hosts: debmirror remote_user: ansible become: yes - vars: - hostname: debmirror - debian_mirror: http://ftp.fi.debian.org/debian - debian_mirror_src: http://ftp.fi.debian.org/debian - distro: jessie - codeliwfidistro: jessie - mailname: debmirror.liw.fi - relayhost: pieni.net:587 - smarthost: hrun.pieni.net - smarthost_user: pienirelay - smarthost_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}" roles: - code.liw.fi-using-apt - sane-debian-system diff --git a/ansible/group_vars/infinland.yml b/ansible/group_vars/infinland.yml index 0bb6e57..6b12274 100644 --- a/ansible/group_vars/infinland.yml +++ b/ansible/group_vars/infinland.yml @@ -3,3 +3,7 @@ debian_mirror_src: http://httpredir.debian.org/debian sshforward_key: "{{ lookup('pipe', 'pass show sshforward/e2obbench') }}" sshforward_key_pub: > {{ lookup('pipe', 'pass show sshforward/e2obbench.pub') }} +relayhost: pieni.net:587 +smarthost: hrun.pieni.net +smarthost_user: pienirelay +smarthost_password: "{{ lookup('pipe', 'pass show pieni.net/pienirelay') }}" diff --git a/ansible/host_vars/debmirror.yml b/ansible/host_vars/debmirror.yml new file mode 100644 index 0000000..9afee6c --- /dev/null +++ b/ansible/host_vars/debmirror.yml @@ -0,0 +1,2 @@ +codeliwfidistro: jessie +mailname: debmirror.liw.fi |