home · contact · privacy
Improve idempotency.
authorChristian Heller <c.heller@plomlompom.de>
Sat, 15 Apr 2017 00:46:04 +0000 (02:46 +0200)
committerChristian Heller <c.heller@plomlompom.de>
Sat, 15 Apr 2017 00:46:04 +0000 (02:46 +0200)
15 files changed:
ansible/config.yml
ansible/files/apt-mark/3d_acceleration [new file with mode: 0644]
ansible/files/apt-mark/basic_x_tools [new file with mode: 0644]
ansible/files/apt-mark/browser_environment [new file with mode: 0644]
ansible/files/apt-mark/console [new file with mode: 0644]
ansible/files/apt-mark/core [new file with mode: 0644]
ansible/files/apt-mark/man [new file with mode: 0644]
ansible/files/apt-mark/manual [deleted file]
ansible/files/apt-mark/minimal_ansible_environment [new file with mode: 0644]
ansible/files/apt-mark/minimal_x [new file with mode: 0644]
ansible/files/apt-mark/newest_kernel [new file with mode: 0644]
ansible/files/apt-mark/power_management [new file with mode: 0644]
ansible/files/apt-mark/required [deleted file]
ansible/files/apt-mark/required-plus [deleted file]
ansible/files/apt-mark/sudo_git_vim_less_openssh [new file with mode: 0644]

index 5e7503b64b51d5e56c3af2f5575c73d7136d0ee0..d96d2b64d558d452ac6242ed33767d58b28e6a72 100644 (file)
   # Upgrade kernel.
   - name: ensure newest kernel and grub are installed
     apt: name={{item}} state=present
-    with_items:
-    - linux-image-amd64
-    - grub2
+    with_lines: cat ~/config/ansible/files/apt-mark/newest_kernel | sed -e 's/ *#.*$//'
+    #with_items:
+    #- linux-image-amd64
+    #- grub2
   - name: update grub
     shell: update-grub
 
   # Ensure power management.
   - name: ensure power management tools are installed
     apt: name={{item}} state=present
-    with_items:
-    - tlp
-    - acpi-call-dkms
+    with_lines: cat ~/config/ansible/files/apt-mark/power_management | sed -e 's/ *#.*$//'
+    #with_items:
+    #- tlp
+    #- acpi-call-dkms
   - name: start TLP
     shell: tlp start
 
     with_fileglob: ~/config/ansible/files/console/*
   - name: ensure locales and console-setup are installed
     apt: name={{item}} state=present
-    with_items:
-    - locales
-    - console-setup
+    with_lines: cat ~/config/ansible/files/apt-mark/console | sed -e 's/ *#.*$//'
+    #with_items:
+    #- locales
+    #- console-setup
   - name: generate en_US.UTF-8 locale
     locale_gen: name=en_US.UTF-8 state=present
   - name: run setupcon to apply console settings from /etc/default/
     file: state=directory dest=~/.vimbackups
   - name: ensure man-db, manpages is installed
     apt: name={{item}} state=present
-    with_items:
-    - man-db
-    - manpages
+    with_lines: cat ~/config/ansible/files/apt-mark/man | sed -e 's/ *#.*$//'
+    #with_items:
+    #- man-db
+    #- manpages
   - name: set /etc/localtime
     file: state=link force=yes src=/usr/share/zoneinfo/Europe/Berlin dest=/etc/localtime
   - name: ensure sudo, git, vim, less, openssh are installed
     apt: name={{item}} state=present
-    with_items:
-    - git
-    - vim
-    - less
-    - sudo
-    - openssh-client
+    with_lines: cat ~/config/ansible/files/apt-mark/sudo_git_vim_less_openssh | sed -e 's/ *#.*$//'
+    #with_items:
+    #- git
+    #- vim
+    #- less
+    #- sudo
+    #- openssh-client
   - name: ensure boot messages are not cleared on start up
     replace: dest=/etc/systemd/system/getty.target.wants/getty@tty1.service regexp='^TTYVTDisallocate=yes.*$' replace='TTYVTDisallocate=no'
 
   # Ensure X window environment.
   - name: ensure minimal X window environment
     apt: name={{item}} state=present
-    with_items:
-    - xserver-xorg-core
-    - xserver-xorg-input-evdev  # supports all input devices the kernel knows about
-    - xinit  # contains startx
-    - libpam-systemd  # needed to start X as non-root
+    with_lines: cat ~/config/ansible/files/apt-mark/minimal_x | sed -e 's/ *#.*$//'
+    #with_items:
+    #- xserver-xorg-core
+    #- xserver-xorg-input-evdev  # supports all input devices the kernel knows about
+    #- xinit  # contains startx
+    #- libpam-systemd  # needed to start X as non-root
   - name: ensure 3d acceleration and optimus switch
     apt: name={{item}} state=present
-    with_items:
-    - linux-headers-amd64  # necessary to build proper nvidia-driver module
-    - libgl1-mesa-dri  # necessary for OpenGL 3D acceleration to work
-    - libglu1-mesa  # necessary for OpenGL 3D acceleration to work
-    - bumblebee-nvidia
-    - primus
+    with_lines: cat ~/config/ansible/files/apt-mark/3d_acceleration | sed -e 's/ *#.*$//'
+    #with_items:
+    #- linux-headers-amd64  # necessary to build proper nvidia-driver module
+    #- libgl1-mesa-dri  # necessary for OpenGL 3D acceleration to work
+    #- libglu1-mesa  # necessary for OpenGL 3D acceleration to work
+    #- bumblebee-nvidia
+    #- primus
   - name: ensure basic X tools
     apt: name={{item}} state=present
-    with_items:
-    - xterm
-    - x11-xserver-utils  # includes xrdb which applies .Xresources files
-    - redshift 
-    - i3
-    - i3status
-    - dmenu
+    with_lines: cat ~/config/ansible/files/apt-mark/basic_x_tools | sed -e 's/ *#.*$//'
+    #with_items:
+    #- xterm
+    #- x11-xserver-utils  # includes xrdb which applies .Xresources files
+    #- redshift 
+    #- i3
+    #- i3status
+    #- suckless-tools 
 
   # Set up pentadactyl.
   - name: ensure browser environment
     apt: name={{item}} state=present
-    with_items:
-    - iceweasel
-    - xul-ext-noscript
-    - xul-ext-pentadactyl
-    - vim-gtk  # used by pentadactyl for text editing
+    with_lines: cat ~/config/ansible/files/apt-mark/browser_environment | sed -e 's/ *#.*$//'
+    #with_items:
+    #- iceweasel
+    #- xul-ext-noscript
+    #- xul-ext-pentadactyl
+    #- vim-gtk  # used by pentadactyl for text editing
 
   # Remove undesired packages
-  - name: collect required packages
-    shell: cat files/apt-mark/* > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted
+#  - name: register number of installed packages
+#    shell: dpkg-query -Wf 'x' | wc -c
+#    register: package_count
+#  
+#
+  - name: collect desired packages
+    shell: cat files/apt-mark/*  | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted
   - name: collect currently installed packages
     shell: dpkg-query -Wf '${Package}\n' > /tmp/all_unsorted && sort /tmp/all_unsorted > /tmp/all_sorted
   - name: create black list of packages to mark as automatically installed from the difference between the required packages and the packages currently installed
     shell: comm -3 /tmp/all_sorted /tmp/white_list_sorted > /tmp/list_black
   - name: mark all packages from black list as automatically installed
     shell: apt-mark auto $(cat /tmp/list_black)
+  - name: mark all packages from white list as manually installed
+    shell: apt-mark manual $(cat /tmp/white_list_unsorted)
   - name: purge all packages automatically installed that are not depended on
     shell: DEBIAN_FRONTEND=noninteractive apt-get -y --purge autoremove
diff --git a/ansible/files/apt-mark/3d_acceleration b/ansible/files/apt-mark/3d_acceleration
new file mode 100644 (file)
index 0000000..6d1064f
--- /dev/null
@@ -0,0 +1,5 @@
+bumblebee-nvidia
+libgl1-mesa-dri  # necessary for OpenGL 3D acceleration to work
+libglu1-mesa  # necessary for OpenGL 3D acceleration to work
+linux-headers-amd64  # necessary to build proper nvidia-driver module
+primus
diff --git a/ansible/files/apt-mark/basic_x_tools b/ansible/files/apt-mark/basic_x_tools
new file mode 100644 (file)
index 0000000..7798e3b
--- /dev/null
@@ -0,0 +1,6 @@
+i3
+i3status
+redshift
+suckless-tools
+xterm
+x11-xserver-utils  # includes xrdb which applies .Xresources files
diff --git a/ansible/files/apt-mark/browser_environment b/ansible/files/apt-mark/browser_environment
new file mode 100644 (file)
index 0000000..cc9575c
--- /dev/null
@@ -0,0 +1,4 @@
+iceweasel
+vim-gtk  # used by pentadactyl for text editing
+xul-ext-noscript
+xul-ext-pentadactyl
diff --git a/ansible/files/apt-mark/console b/ansible/files/apt-mark/console
new file mode 100644 (file)
index 0000000..01bcbf8
--- /dev/null
@@ -0,0 +1,2 @@
+console-setup
+locales
diff --git a/ansible/files/apt-mark/core b/ansible/files/apt-mark/core
new file mode 100644 (file)
index 0000000..43afba8
--- /dev/null
@@ -0,0 +1,55 @@
+base-files
+base-passwd
+bash
+bsdutils
+coreutils
+dash
+debconf
+debianutils
+diffutils
+dpkg
+e2fslibs
+e2fsprogs
+findutils
+gcc-6-base
+grep
+gzip
+hostname
+init-system-helpers
+libacl1
+libattr1
+libblkid1
+libc6
+libc-bin
+libcomerr2
+libfdisk1
+libgcc1
+liblzma5
+libmount1
+libpam0g
+libpam-modules
+libpam-modules-bin
+libpam-runtime
+libpcre3
+libselinux1
+libsepol1
+libsmartcols1
+libss2
+libtinfo5
+libuuid1
+login
+lsb-base
+mawk
+mount
+multiarch-support
+ncurses-base
+ncurses-bin
+passwd
+perl-base
+sed
+sensible-utils
+sysvinit-utils
+tar
+tzdata
+util-linux
+zlib1g
diff --git a/ansible/files/apt-mark/man b/ansible/files/apt-mark/man
new file mode 100644 (file)
index 0000000..f688e67
--- /dev/null
@@ -0,0 +1,2 @@
+man-db
+manpages
diff --git a/ansible/files/apt-mark/manual b/ansible/files/apt-mark/manual
deleted file mode 100644 (file)
index d2e1137..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-acpi-call-dkms
-bumblebee-nvidia
-console-setup
-dmenu
-git
-grub2
-i3
-i3status
-iceweasel
-less
-libgl1-mesa-dri
-libglu1-mesa
-libpam-systemd
-linux-headers-amd64
-linux-image-amd64
-locales
-man-db
-manpages
-openssh-client
-primus
-redshift
-sudo
-tlp
-vim
-vim-gtk
-xinit
-x11-xserver-utils
-xserver-xorg-core
-xserver-xorg-input-evdev
-xterm
-xul-ext-noscript
-xul-ext-pentadactyl
diff --git a/ansible/files/apt-mark/minimal_ansible_environment b/ansible/files/apt-mark/minimal_ansible_environment
new file mode 100644 (file)
index 0000000..c4e6c7f
--- /dev/null
@@ -0,0 +1,3 @@
+ansible
+ifupdown
+isc-dhcp-client
diff --git a/ansible/files/apt-mark/minimal_x b/ansible/files/apt-mark/minimal_x
new file mode 100644 (file)
index 0000000..f785794
--- /dev/null
@@ -0,0 +1,4 @@
+libpam-systemd  # needed to start X as non-root
+xinit  # contains startx
+xserver-xorg-core
+xserver-xorg-input-evdev  # supports all input devices the kernel knows about
diff --git a/ansible/files/apt-mark/newest_kernel b/ansible/files/apt-mark/newest_kernel
new file mode 100644 (file)
index 0000000..f85a87c
--- /dev/null
@@ -0,0 +1,2 @@
+linux-image-amd64
+grub2
diff --git a/ansible/files/apt-mark/power_management b/ansible/files/apt-mark/power_management
new file mode 100644 (file)
index 0000000..ada304e
--- /dev/null
@@ -0,0 +1,2 @@
+acpi-call-dkms
+tlp
diff --git a/ansible/files/apt-mark/required b/ansible/files/apt-mark/required
deleted file mode 100644 (file)
index 43afba8..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-base-files
-base-passwd
-bash
-bsdutils
-coreutils
-dash
-debconf
-debianutils
-diffutils
-dpkg
-e2fslibs
-e2fsprogs
-findutils
-gcc-6-base
-grep
-gzip
-hostname
-init-system-helpers
-libacl1
-libattr1
-libblkid1
-libc6
-libc-bin
-libcomerr2
-libfdisk1
-libgcc1
-liblzma5
-libmount1
-libpam0g
-libpam-modules
-libpam-modules-bin
-libpam-runtime
-libpcre3
-libselinux1
-libsepol1
-libsmartcols1
-libss2
-libtinfo5
-libuuid1
-login
-lsb-base
-mawk
-mount
-multiarch-support
-ncurses-base
-ncurses-bin
-passwd
-perl-base
-sed
-sensible-utils
-sysvinit-utils
-tar
-tzdata
-util-linux
-zlib1g
diff --git a/ansible/files/apt-mark/required-plus b/ansible/files/apt-mark/required-plus
deleted file mode 100644 (file)
index c4e6c7f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-ansible
-ifupdown
-isc-dhcp-client
diff --git a/ansible/files/apt-mark/sudo_git_vim_less_openssh b/ansible/files/apt-mark/sudo_git_vim_less_openssh
new file mode 100644 (file)
index 0000000..e37a898
--- /dev/null
@@ -0,0 +1,5 @@
+git
+less
+openssh-client
+sudo
+vim