aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--roles/etckeeper/defaults/main.yml4
-rw-r--r--roles/etckeeper/tasks/main.yml4
-rw-r--r--roles/letsencrypt/defaults/main.yml2
-rw-r--r--roles/my_workspace/defaults/main.yml4
-rw-r--r--roles/my_workspace/tasks/main.yml4
5 files changed, 9 insertions, 9 deletions
diff --git a/roles/etckeeper/defaults/main.yml b/roles/etckeeper/defaults/main.yml
index e783002..5a44cb1 100644
--- a/roles/etckeeper/defaults/main.yml
+++ b/roles/etckeeper/defaults/main.yml
@@ -1,5 +1,5 @@
-git_name: Egor Tensin
-git_email: Egor.Tensin@gmail.com
+#etckeeper_git_name:
+#etckeeper_git_email:
etckeeper_remote_name: origin
#etckeeper_remote_url:
diff --git a/roles/etckeeper/tasks/main.yml b/roles/etckeeper/tasks/main.yml
index f609ce7..c426c05 100644
--- a/roles/etckeeper/tasks/main.yml
+++ b/roles/etckeeper/tasks/main.yml
@@ -19,9 +19,9 @@
value: '{{ item.value }}'
loop:
- name: user.name
- value: '{{ git_name }}'
+ value: '{{ etckeeper_git_name }}'
- name: user.email
- value: '{{ git_email }}'
+ value: '{{ etckeeper_git_email }}'
- name: Initial commit
become: true
diff --git a/roles/letsencrypt/defaults/main.yml b/roles/letsencrypt/defaults/main.yml
index e9c4b1a..2856ab6 100644
--- a/roles/letsencrypt/defaults/main.yml
+++ b/roles/letsencrypt/defaults/main.yml
@@ -1,4 +1,4 @@
letsencrypt_domains: []
-letsencrypt_email: Egor.Tensin@gmail.com
+#letsencrypt_email:
letsencrypt_credentials_ini: /root/.certbot.ini
diff --git a/roles/my_workspace/defaults/main.yml b/roles/my_workspace/defaults/main.yml
index d1104af..2eb04de 100644
--- a/roles/my_workspace/defaults/main.yml
+++ b/roles/my_workspace/defaults/main.yml
@@ -1,5 +1,5 @@
-git_name: Egor Tensin
-git_email: Egor.Tensin@gmail.com
+#my_workspace_git_name:
+#my_workspace_git_email:
my_workspace_dir: /srv/workspace
my_workspace_projects: []
diff --git a/roles/my_workspace/tasks/main.yml b/roles/my_workspace/tasks/main.yml
index 42039b9..462c8da 100644
--- a/roles/my_workspace/tasks/main.yml
+++ b/roles/my_workspace/tasks/main.yml
@@ -21,13 +21,13 @@
community.general.git_config:
scope: global
name: user.name
- value: '{{ git_name }}'
+ value: '{{ my_workspace_git_name }}'
- name: Set user.email
community.general.git_config:
scope: global
name: user.email
- value: '{{ git_email }}'
+ value: '{{ my_workspace_git_email }}'
- name: Update projects
ansible.builtin.include_tasks: project.yml