chore: tidy up by removing stuff specific to me

Sponsored-by: author

6 files changed, 10 insertions, 54 deletions

diff --git a/README.md b/README.md
index 700160b..1d1294e 100644
--- a/README.md
+++ b/README.md
@@ -34,8 +34,7 @@ To use **v-i** to install Debian on a PC:
 * Run the command: `v-i --verbose exolobe5.yaml`
 * See `installer.log` for what happened during the installation.
 
-Example target specification file (see [exolobe5-spec.yaml](exolobe5-spec.yaml)
-for the version used in production):
+Example target specification file:
 
 ```yaml
 drive: /dev/nvme0n1
@@ -77,6 +76,9 @@ Explanation:
   [`std.yml`][]) that it uses unconditionally, to set up a "standard
   system" that the author likes. You can provide additional playbooks,
   for additional configuration at installation time.
+  - the `user_pub` variable contains an SSH public key that gets
+    installed into the `root` user `authorized_keys` file on the
+    installed system
 * `ansible_vars`---variables to set for Ansible playbooks.
 
 With all this configuration in a file, which you can keep in git, you
diff --git a/exolobe5-ansible.yml b/exolobe5-ansible.yml
deleted file mode 100644
index a07df29..0000000
--- a/exolobe5-ansible.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-- hosts: image
-  tasks:
-    - name: "format LV for VM images"
-      filesystem:
-        dev: /dev/vg0/vms
-        fstype: ext4
-    - name: "create mount point for VM images"
-      file:
-        state: directory
-        path: /mnt/vms
-    - name: "mount LV for VM images"
-      mount:
-        src: /dev/vg0/vms
-        path: /mnt/vms
-        fstype: ext4
-        opts: defaults
-        state: mounted
diff --git a/exolobe5-spec.yaml b/exolobe5-spec.yaml
deleted file mode 100644
index 8760d07..0000000
--- a/exolobe5-spec.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-drive: /dev/nvme0n1
-extra_drives:
-  - /dev/nvme1n1
-hostname: exolobe5
-extra_playbooks:
-  - exolobe5-ansible.yml
-ansible_vars:
-  user_pub: |
-   ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQe6lsTapAxiwhhEeE/ixuK+5N8esCsMWoekQqjtxjP liw personal systems
-extra_lvs:
-  - name: vms
-    size: 1T
-    fstype: ext4
-    mounted: /mnt/vms
diff --git a/installer-ansible.yml b/installer-ansible.yml
index ad0d2f6..2d555a0 100644
--- a/installer-ansible.yml
+++ b/installer-ansible.yml
@@ -23,15 +23,6 @@
         group: root
         mode: 0700
 
-    - name: "set root authorized keys"
-      copy:
-        content: |
-          {{ user_pub }}
-        dest: /root/.ssh/authorized_keys
-        owner: root
-        group: root
-        mode: 0600
-
     - name: "configure keyboard layout"
       copy:
         content: |
@@ -92,8 +83,6 @@
   vars:
     hostname: v-i
     ansible_python_interpreter: /usr/bin/python3
-    user_pub: |
-      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQe6lsTapAxiwhhEeE/ixuK+5N8esCsMWoekQqjtxjP liw personal systems
     ci_prod_signing_key: |
         -----BEGIN PGP PUBLIC KEY BLOCK-----
 
diff --git a/liw.yml b/liw.yml
deleted file mode 100644
index 35fc54d..0000000
--- a/liw.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-hostname: x220
-user_pub: |
-  ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPQe6lsTapAxiwhhEeE/ixuK+5N8esCsMWoekQqjtxjP liw personal systems
-user_locale: |
-  LC_CTYPE=fi_FI.UTF8
-user_keyboard_model: pc105
-user_keyboard_layout: fi
-user_console_codeset: Lat15
diff --git a/std.yml b/std.yml
index cb62c82..0814f95 100644
--- a/std.yml
+++ b/std.yml
@@ -11,6 +11,10 @@
           {{ hostname }}
         dest: /etc/hostname
 
+    - name: "lock root password"
+      shell: |
+        passwd -l root
+
     - name: "create ~root/.ssh"
       file:
         state: directory
@@ -53,7 +57,7 @@
       copy:
         content: |
           {{ user_locale }}
-        dest: /etc/profile.d/finnish.sh
+        dest: /etc/profile.d/locale.sh
 
     - name: "remove ifupdown"
       apt:
@@ -80,7 +84,7 @@
 
     # You may want to override these.
     user_locale: |
-      LC_CTYPE=fi_FI.UTF8
+      export LC_CTYPE=fi_FI.UTF8
     user_keyboard_model: pc105
     user_keyboard_layout: fi
     user_console_codeset: Lat15