umgebaut und verschlankt

diff --git a/library/bootstrap.yml b/library/bootstrap.yml
index 2e6a5bd0982b4f22eeacaf76087ece2f6ab6ea63..0b36ab1a5e3a9fd8e35954016fde0ad264dead9d 100644 (file)
--- a/library/bootstrap.yml
+++ b/library/bootstrap.yml
@@ -5,24 +5,20 @@
     update_password: always
     password: "{{ ansibleuser|password_hash('sha512') }}"
 - name: hide system-account
     update_password: always
     password: "{{ ansibleuser|password_hash('sha512') }}"
 - name: hide system-account

-  ansible.builtin.copy:
-    dest: /var/lib/AccountsService/users/ansible
-    content: |
-      [User]
-      Session=
-      XSession=
-      Icon=/home/ansible/.face
-      SystemAccount=true
-      [InputSource0]
-      xkb=de
+  ansible.builtin.lineinfile:
+    path: /var/lib/AccountsService/users/ansible
+    regex: 'SystemAccount=*'
+    line: 'SystemAccount=true'

 - name: remove apt-config-file derived from preseeding
   ansible.builtin.file:
     path: /etc/apt/apt.conf
     state: absent
 - name: copy new apt-proxy config file to apt.conf.d-dir
 - name: remove apt-config-file derived from preseeding
   ansible.builtin.file:
     path: /etc/apt/apt.conf
     state: absent
 - name: copy new apt-proxy config file to apt.conf.d-dir

-  ansible.builtin.template:
-    src: fsit-cmgt/templates/apt-proxy_01proxy.j2
+  ansible.builtin.copy:

     dest: /etc/apt/apt.conf.d/01proxy
     dest: /etc/apt/apt.conf.d/01proxy

+    content: |
+      Acquire::http { Proxy "http://{{ aptproxy }}:3142"; };
+      Acquire::https { Proxy "https://"; };

 - name: Update and upgrade apt packages
   apt:
     update_cache: yes
 - name: Update and upgrade apt packages
   apt:
     update_cache: yes


@@ -35,12 +31,12 @@
     - inxi
     - bmon
     - vim
     - inxi
     - bmon
     - vim

-       #- name: stop automatic remote printer installation
-       #ansible.builtin.systemd:
-       #name: cups-browsed
-       #state: stopped
-       #- name: disable automatic remote printer installation
-       #ansible.builtin.systemd:
-       #name: cups-browsed
-       #enabled: no
+#- name: stop automatic remote printer installation
+#  ansible.builtin.systemd:
+#    name: cups-browsed
+#    state: stopped
+#- name: disable automatic remote printer installation
+#  ansible.builtin.systemd:
+#    name: cups-browsed
+#    enabled: no

 ...
 ...