Clean up proxy configuraton.

lmn-desktop.yml

@@ -26,6 +26,8 @@
     kerberize_uris: steinbeis.schule
     apt_conf: Acquire::http::Proxy "http://aptcache.pn.steinbeis.schule:3142/";
     ntp_serv: server.pn.steinbeis.schule
+    proxy: http://firewall.pn.steinbeis.schule:3128
+    no_proxy: firewall.pn.steinbeis.schule,server.pn.steinbeis.schule,idam.steinbeis.schule,dw.steinbeis.schule,.pn.steinbeis.schule,.steinbeis.schule
 
     ## PAM mount nextcloud, remove or leave empty to skip:
     web_dav: https://nc.steinbeis.schule/remote.php/dav/files/%(USER)

roles/lmn_network/tasks/main.yml

@@ -1,4 +1,12 @@
 ---
+- name: Deploy http proxy config
+  copy:
+    dest: /etc/environment.d/10-lmn-proxy.conf
+    content: |
+      http_proxy="{{ proxy }}"
+      https_proxy="{{ proxy }}"
+      ftp_proxy="{{ proxy }}"
+      no_proxy="{{ no_proxy }}"
 
 - name: set aptcache
   ansible.builtin.copy:

roles/lmn_packages/tasks/main.yml

@@ -1,15 +0,0 @@
----
-- name: install additional packages
-  apt:
-    name:
-      - ttf-mscorefonts-installer
-      - sqlite3
-      - sqlitebrowser
-      - neovim
-    state: latest
-    autoremove: true
-  environment:
-    http_proxy: http://firewall.pn.steinbeis.schule:3128
-    https_proxy: http://firewall.pn.steinbeis.schule:3128
-
-

roles/lmn_vm/files/lmn-proxy.sh

@@ -1,4 +0,0 @@
-export http_proxy='http://firewall.pn.steinbeis.schule:3128'
-export https_proxy=$http_proxy
-export ftp_proxy=$http_proxy
-export no_proxy=firewall.pn.steinbeis.schule,server.pn.steinbeis.schule,idam.steinbeis.schule,dw.steinbeis.schule,.pn.steinbeis.schule,.steinbeis.schule

roles/lmn_vm/tasks/main.yml

@@ -164,12 +164,6 @@
     path: /usr/lib/qemu/qemu-bridge-helper
     mode: '4755'
 
-- name: Deploy http proxy config
-  copy:
-    src: lmn-proxy.sh
-    dest: /etc/profile.d/
-    mode: '0644'
-
 - name: Create directory for local .desktop-Files
   ansible.builtin.file:
     path: "{ item }"