3 files changed, 13 insertions, 13 deletions
diff --git a/roles/sane_debian_system/tasks/apt.yml b/roles/sane_debian_system/tasks/apt.yml
index d7c82d4..21eea70 100644
--- a/roles/sane_debian_system/tasks/apt.yml
+++ b/roles/sane_debian_system/tasks/apt.yml
@@ -1,9 +1,9 @@
 # Safety check: make sure debian_codename is set.
-- name: check that debian_codename is set
+- name: check that sane_debian_system_codename is set
   shell: |
-    if [ "{{ debian_codename }}" = "" ]
+    if [ "{{ sane_debian_system_codename }}" = "" ]
     then
-        echo "You MUST set debian_codename" 1>&2
+        echo "You MUST set sane_debian_system_codename" 1>&2
         exit 1
     fi
 
@@ -42,13 +42,13 @@
     dest: /etc/apt/sources.list
 
 - name: additional sources.list.d/*
-  with_items: "{{ sources_lists }}"
+  with_items: "{{ sane_debian_system_sources_lists }}"
   apt_repository:
     repo: "{{ item.repo }}"
     update_cache: no
 
 - name: add archive signing keys
-  with_items: "{{ sources_lists }}"
+  with_items: "{{ sane_debian_system_sources_lists }}"
   apt_key:
     data: "{{ item.signing_key }}"
     state: present
@@ -60,7 +60,7 @@
     cache_valid_time: 0
 
 - name: add archive keyrings
-  with_items: "{{ sources_lists }}"
+  with_items: "{{ sane_debian_system_sources_lists }}"
   apt:
     name: "{{ item.keyring_package }}"
   when: item.keyring_package is defined
diff --git a/roles/sane_debian_system/tasks/env.yml b/roles/sane_debian_system/tasks/env.yml
index 3b6ae9e..db8f5ba 100644
--- a/roles/sane_debian_system/tasks/env.yml
+++ b/roles/sane_debian_system/tasks/env.yml
@@ -4,19 +4,19 @@
 
 - name: set /etc/hostname
   hostname:
-    name: "{{ hostname }}"
-  when: hostname is defined
+    name: "{{ sane_debian_system_hostname }}"
+  when: sane_debian_system_hostname is defined
 
 - name: add hostname to /etc/hosts
   lineinfile:
     dest: /etc/hosts
     regexp: '^127\.0\.1\.1 '
-    line: "127.0.1.1 {{ hostname }}"
-  when: hostname is defined
+    line: "127.0.1.1 {{ sane_debian_system_hostname }}"
+  when: sane_debian_system_hostname is defined
 
 - name: set timezone
   timezone:
-    name: "{{ timezone }}"
+    name: "{{ sane_debian_system_timezone }}"
 
 - name: install environment packages
   apt:
@@ -29,4 +29,4 @@
   locale_gen:
     name: "{{ item }}"
     state: present
-  with_items: "{{ locales }}"
+  with_items: "{{ sane_debian_system_locales }}"
diff --git a/roles/sane_debian_system/tasks/main.yml b/roles/sane_debian_system/tasks/main.yml
index 5a16724..7722f1c 100644
--- a/roles/sane_debian_system/tasks/main.yml
+++ b/roles/sane_debian_system/tasks/main.yml
@@ -1,6 +1,6 @@
 - name: "sane_debian_system_version"
   shell: |
-    [ "{{ sane_debian_system_version }}" = "0" ] || \
+    [ "{{ sane_debian_system_version }}" = "1" ] || \
       (echo "Unexpected version {{ sane_debian_system_version }}" 1>&2; exit 1)
  
 - include: apt.yml