From: Christian Heller Date: Sun, 10 Sep 2017 10:00:18 +0000 (+0200) Subject: Fix minor bugs with new ansible tree. X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/balance2?a=commitdiff_plain;h=a8b7d1a46c9234473931171b20e3ac805f43d2c1;p=config Fix minor bugs with new ansible tree. --- diff --git a/ansible/config_new.yml b/ansible/config_new.yml index 103026b..2f86ac3 100644 --- a/ansible/config_new.yml +++ b/ansible/config_new.yml @@ -35,7 +35,7 @@ with_fileglob: ~/config/ansible/files/console/* - name: ensure locales and console-setup are installed apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/minimal/console | sed -e 's/ *#.*$//' + with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/console | sed -e 's/ *#.*$//' - 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/ @@ -51,12 +51,12 @@ file: state=directory dest=~/.vimbackups - name: ensure man-db, manpages are installed apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/minimal/man | sed -e 's/ *#.*$//' + with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/man | sed -e 's/ *#.*$//' - name: set /etc/localtime file: state=link force=yes src=/usr/share/zoneinfo/Europe/Berlin dest=/etc/localtime - name: ensure various useful tools are installed – sudo, git, vim, less, openssh apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/minimal/various_useful | sed -e 's/ *#.*$//' + with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/various_useful | sed -e 's/ *#.*$//' - 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' @@ -71,20 +71,20 @@ # Ensure X window environment. - name: ensure minimal X window environment apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/{{ system_name }}/minimal_x | sed -e 's/ *#.*$//' + with_lines: cat ~/config/ansible/files/apt-mark_new/{{ system_name }}/minimal_x | sed -e 's/ *#.*$//' #- name: ensure 3d acceleration and optimus switch # apt: name={{item}} state=present # with_lines: cat ~/config/ansible/files/apt-mark/3d_acceleration | sed -e 's/ *#.*$//' - - name: ensure user plom is in bumblebee group - user: name=plom groups=bumblebee append=yes + #- name: ensure user plom is in bumblebee group + # user: name=plom groups=bumblebee append=yes - name: ensure basic X tools apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/minimal/basic_x_tools | sed -e 's/ *#.*$//' + with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/basic_x_tools | sed -e 's/ *#.*$//' # Set up pentadactyl. - name: ensure browser environment apt: name={{item}} state=present - with_lines: cat ~/config/ansible/files/apt-mark/minimal/browser_environment | sed -e 's/ *#.*$//' + with_lines: cat ~/config/ansible/files/apt-mark_new/minimal/browser_environment | sed -e 's/ *#.*$//' # Ensure wifi. #- name: ensure wifi configuration @@ -105,7 +105,7 @@ # Remove undesired packages - name: collect desired packages - shell: cat files/apt-mark/minimal/* files/apt-mark/{{ system_name }}/* | sed -e 's/ *#.*$//' > /tmp/white_list_unsorted && sort /tmp/white_list_unsorted > /tmp/white_list_sorted + shell: cat files/apt-mark/minimal/* files/apt-mark_new/{{ system_name }}/* | 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 diff --git a/ansible/run_root_new.sh b/ansible/run_root_new.sh index 46c370e..36408a8 100755 --- a/ansible/run_root_new.sh +++ b/ansible/run_root_new.sh @@ -1 +1 @@ -ansible-playbook -i 'localhost,' -e system_name=X200s -c local config.yml +ansible-playbook -i 'localhost,' -e system_name=X200s -c local config_new.yml diff --git a/ansible/run_user_new.sh b/ansible/run_user_new.sh index abffede..510faad 100755 --- a/ansible/run_user_new.sh +++ b/ansible/run_user_new.sh @@ -1 +1 @@ -ansible-playbook -i 'localhost,' -e system_name=X200s -c local user.yml +ansible-playbook -i 'localhost,' -e system_name=X200s -c local user_new.yml