commit 4949ef99c239cde9c334c436a4a3d5f60fa52126 Author: Y Date: Sun Nov 19 13:32:08 2017 +0100 init diff --git a/ansible-playbook.log b/ansible-playbook.log new file mode 100644 index 0000000..223c1d9 --- /dev/null +++ b/ansible-playbook.log @@ -0,0 +1,83 @@ + +PLAY [localhost] *************************************************************** + nfs -> cleanupdate +TASK [Gathering Facts] ********************************************************* + cleanupdate -> init +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper init.yml" ok (init begin) + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper upstream.yml" ok + +TASK [init : debug] ************************************************************ + "msg": "init upstream" ok + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper merge.yml" ok + +TASK [init : debug] ************************************************************ + "msg": "init local" ok + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper local.yml" ok (init end) + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper upstream.yml" ok (cleanupdate begin) + +TASK [cleanupdate : debug] ***************************************************** + "msg": "cleanupdate upstream" ok + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper merge.yml" ok (cleanupdate end) + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper upstream.yml" ok (nfs begin) + +TASK [nfs : debug] ************************************************************* + "msg": "nfs upstream" ok + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper merge.yml" ok + +TASK [nfs : debug] ************************************************************* + "msg": "nfs local" ok + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper local.yml" ok (nfs end) + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper init.yml" ?? + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper upstream.yml" ?? + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper merge.yml" ?? + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper local.yml" ?? + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper upstream.yml" ?? + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper merge.yml" ?? + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper upstream.yml" ok (postgresql begin) + +TASK [postgresql : debug] ****************************************************** + "msg": "postgresql upstream" ok + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper merge.yml" ok + +TASK [postgresql : debug] ****************************************************** + "msg": "postgresql local" ok + +TASK [etckeeper.inc : debug] *************************************************** + "msg": "etckeeper local.yml" ok (postgresql end) + +PLAY RECAP ********************************************************************* +localhost : ok=26 changed=0 unreachable=0 failed=0 + diff --git a/production b/production new file mode 100644 index 0000000..2fbb50c --- /dev/null +++ b/production @@ -0,0 +1 @@ +localhost diff --git a/roles/cleanupdate/defaults/main.yml b/roles/cleanupdate/defaults/main.yml new file mode 100644 index 0000000..5fa9e6e --- /dev/null +++ b/roles/cleanupdate/defaults/main.yml @@ -0,0 +1,2 @@ +--- +ansible_python_interpreter: /usr/bin/python2 diff --git a/roles/cleanupdate/meta/main.yml b/roles/cleanupdate/meta/main.yml new file mode 100644 index 0000000..1257100 --- /dev/null +++ b/roles/cleanupdate/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: init diff --git a/roles/cleanupdate/tasks/main.yml b/roles/cleanupdate/tasks/main.yml new file mode 100644 index 0000000..aec6902 --- /dev/null +++ b/roles/cleanupdate/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- name: pull prerequisites from upstream + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=upstream.yml + vars: + msg: pacman clean update + +- debug: msg="cleanupdate upstream" + +- name: merge upstream + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=merge.yml + vars: + msg: pacman clean update + diff --git a/roles/etckeeper.inc/tasks/init.yml b/roles/etckeeper.inc/tasks/init.yml new file mode 100644 index 0000000..a1bbd17 --- /dev/null +++ b/roles/etckeeper.inc/tasks/init.yml @@ -0,0 +1,2 @@ +--- +- debug: msg="etckeeper init.yml" diff --git a/roles/etckeeper.inc/tasks/local.yml b/roles/etckeeper.inc/tasks/local.yml new file mode 100644 index 0000000..c0ba199 --- /dev/null +++ b/roles/etckeeper.inc/tasks/local.yml @@ -0,0 +1,2 @@ +--- +- debug: msg="etckeeper local.yml" diff --git a/roles/etckeeper.inc/tasks/merge.yml b/roles/etckeeper.inc/tasks/merge.yml new file mode 100644 index 0000000..cca851c --- /dev/null +++ b/roles/etckeeper.inc/tasks/merge.yml @@ -0,0 +1,2 @@ +--- +- debug: msg="etckeeper merge.yml" diff --git a/roles/etckeeper.inc/tasks/upstream.yml b/roles/etckeeper.inc/tasks/upstream.yml new file mode 100644 index 0000000..5f2bc73 --- /dev/null +++ b/roles/etckeeper.inc/tasks/upstream.yml @@ -0,0 +1,2 @@ +--- +- debug: msg="etckeeper upstream.yml" diff --git a/roles/init/defaults/main.yml b/roles/init/defaults/main.yml new file mode 100644 index 0000000..5fa9e6e --- /dev/null +++ b/roles/init/defaults/main.yml @@ -0,0 +1,2 @@ +--- +ansible_python_interpreter: /usr/bin/python2 diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml new file mode 100644 index 0000000..418bcc6 --- /dev/null +++ b/roles/init/tasks/main.yml @@ -0,0 +1,23 @@ +- name: init EtcKeeper + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=init.yml + vars: + msg: init + +- name: settings necessary for pulling from upstream + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=upstream.yml + vars: + msg: local settings + +- debug: msg="init upstream" + +- name: merge local settings + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=merge.yml + vars: + msg: local settings + +- debug: msg="init local" + +- name: commit local changes + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=local.yml + vars: + msg: pacman mirrors (after init) diff --git a/roles/nfs/defaults/main.yml b/roles/nfs/defaults/main.yml new file mode 100644 index 0000000..5fa9e6e --- /dev/null +++ b/roles/nfs/defaults/main.yml @@ -0,0 +1,2 @@ +--- +ansible_python_interpreter: /usr/bin/python2 diff --git a/roles/nfs/meta/main.yml b/roles/nfs/meta/main.yml new file mode 100644 index 0000000..5496da8 --- /dev/null +++ b/roles/nfs/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: cleanupdate diff --git a/roles/nfs/tasks/main.yml b/roles/nfs/tasks/main.yml new file mode 100644 index 0000000..431614e --- /dev/null +++ b/roles/nfs/tasks/main.yml @@ -0,0 +1,20 @@ +--- +- name: pull prerequisites from upstream + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=upstream.yml + vars: + msg: NFS + +- debug: msg="nfs upstream" + +- name: merge upstream + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=merge.yml + vars: + msg: NFS + +- debug: msg="nfs local" + +- name: commit local changes + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=local.yml + vars: + msg: NFS + diff --git a/roles/postgresql/defaults/main.yml b/roles/postgresql/defaults/main.yml new file mode 100644 index 0000000..5fa9e6e --- /dev/null +++ b/roles/postgresql/defaults/main.yml @@ -0,0 +1,2 @@ +--- +ansible_python_interpreter: /usr/bin/python2 diff --git a/roles/postgresql/meta/main.yml b/roles/postgresql/meta/main.yml new file mode 100644 index 0000000..5496da8 --- /dev/null +++ b/roles/postgresql/meta/main.yml @@ -0,0 +1,3 @@ +--- +dependencies: + - role: cleanupdate diff --git a/roles/postgresql/tasks/main.yml b/roles/postgresql/tasks/main.yml new file mode 100644 index 0000000..b0fadfa --- /dev/null +++ b/roles/postgresql/tasks/main.yml @@ -0,0 +1,20 @@ +--- +- name: pull prerequisites from upstream + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=upstream.yml + vars: + msg: PostgreSQL + +- debug: msg="postgresql upstream" + +- name: merge upstream + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=merge.yml + vars: + msg: PostgreSQL + +- debug: msg="postgresql local" + +- name: commit local changes + include_role: name=etckeeper.inc allow_duplicates=true tasks_from=local.yml + vars: + msg: PostgreSQL + diff --git a/site.yml b/site.yml new file mode 100644 index 0000000..69b3ecf --- /dev/null +++ b/site.yml @@ -0,0 +1,6 @@ +--- +- hosts: localhost + connection: local + roles: + - nfs + - postgresql