From 97bc91894f2d1b66d057c3f82827d5a7c39b7df7 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Fri, 13 Jul 2018 13:22:44 +0200 Subject: [PATCH] Put git config and etckeeper to common --- roles/ariane/defaults/main.yml | 2 -- roles/ariane/tasks/git.yml | 21 --------------------- roles/ariane/tasks/main.yml | 4 ---- roles/common | 2 +- 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 roles/ariane/tasks/git.yml diff --git a/roles/ariane/defaults/main.yml b/roles/ariane/defaults/main.yml index 3639d2c..3612bbf 100644 --- a/roles/ariane/defaults/main.yml +++ b/roles/ariane/defaults/main.yml @@ -1,7 +1,5 @@ --- -ariane_git: True ariane_sysctl: True - ariane_sysctls: #- key: net.ipv6.conf.all.disable_ipv6 # val: 1 diff --git a/roles/ariane/tasks/git.yml b/roles/ariane/tasks/git.yml deleted file mode 100644 index d934213..0000000 --- a/roles/ariane/tasks/git.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- name: git - gitconfig user.name - git_config: - name: user.name - scope: global - value: "root ({{ ansible_hostname }})" - -- name: git - gitconfig user.email - git_config: - name: user.email - scope: global - value: "admin@fet.at" - -- name: git - gitconfig core.editor - git_config: - name: core.editor - scope: global - value: "vim" - -- name: git - init etckeeper - command: etckeeper init creates=/etc/.git/ diff --git a/roles/ariane/tasks/main.yml b/roles/ariane/tasks/main.yml index 9e7467f..5f1ae4c 100644 --- a/roles/ariane/tasks/main.yml +++ b/roles/ariane/tasks/main.yml @@ -1,8 +1,4 @@ --- -- import_tasks: git.yml - when: ariane_git - tags: ['ariane_git', 'git'] - - import_tasks: sysctl.yml when: ariane_sysctl tags: ['ariane_sysctl', 'sysctl'] diff --git a/roles/common b/roles/common index 99d768f..01603d2 160000 --- a/roles/common +++ b/roles/common @@ -1 +1 @@ -Subproject commit 99d768fa8cf44600293f8163e3485fda69ba1806 +Subproject commit 01603d2043c2d1ded1ec4044eeffc1b2234cc6c3