In ansible scripts, improve X window system setup.

[config] / ansible / config.yml

diff --git a/ansible/config.yml b/ansible/config.yml
index d157a2aa0071733cab6245eeb8b02ef76e715fe7..63689a6eae5fbe04c2686edf9db6e1e13714891c 100644 (file)
--- a/ansible/config.yml
+++ b/ansible/config.yml
@@ -4,21 +4,15 @@
   become: yes
   tasks:
 
-  # Set hostname.
-  - name: symlink hostname file 
-    file: state=link force=yes src=/root/config/ansible/files/_etc_hostname dest=/etc/hostname   
-  - name: symlink hosts file 
-    file: state=link force=yes src=/root/config/ansible/files/_etc_hosts dest=/etc/hosts
+  - name: symlink system files
+    file: state=hard force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}}
+    with_fileglob: ~/config/ansible/files/system/*
   - name: set hostname for current session
     shell: hostname w530
 
   # Configure package management.
-  - name: symlink APT sources file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_apt_sources.list dest=/etc/apt/sources.list
   - name: update package lists
     apt: update_cache=yes
-  - name: symlink APT config file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_apt_apt.conf.d_99mindeps dest=/etc/apt/apt.conf.d/99mindeps
   - name: check for initial_purge_happened flag
     stat: path=flags/initial_purge_happened
     register: initial_purge
@@ -29,51 +23,65 @@
     apt: upgrade=dist
 
   # Configure console.
-  - name: symlink terminal config file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_default_console-setup dest=/etc/default/console-setup
-  - name: symlink keyboard config file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_default_keyboard dest=/etc/default/keyboard
-  - name: ensure locales is installed
-    apt: name=locales state=present
-  - name: ensure setupcon is installed
-    apt: name=console-setup state=present
+  - name: symlink console config files
+    file: state=link force=yes src={{item}} dest={{item|basename|regex_replace('___','/')}}
+    with_fileglob: ~/config/ansible/files/console/*
+  - name: ensure locales and console-setup are installed
+    apt: name={{item}} state=present
+    with_items:
+    - locales
+    - console-setup
   - name: generate en_US.UTF-8 locale
     locale_gen: name=en_US.UTF-8 state=present
-  - name: symlink /etc/profile (with locale export) 
-    file: state=link force=yes src=/root/config/ansible/files/_etc_profile dest=/etc/profile
   - name: run setupcon to apply console settings from /etc/default/
     command: setupcon
-  - 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='TTYVDisallocate=no'
 
-  # Configure timezone.
-  - name: symlink timezone file
-    file: state=link force=yes src=/root/config/ansible/files/_etc_timezone dest=/etc/timezone
+  # Miscellaneous.
+  - name: Ensure dotfile symlinks
+    file: state=link force=yes src={{item}} dest=~/.{{item|basename}}
+    with_fileglob:
+    - ~/config/dotfiles/minimal/*
+    - ~/config/dotfiles/root/*
+  - name: ensure ~/.vimbackups directory
+    file: state=directory dest=~/.vimbackups
+  - name: ensure man-db, manpages is installed
+    apt: name={{item}} state=present
+    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
+  - 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='TTYVDisallocate=no'
 
-  # Set up editor
-  - name: set ~/.vimrc
-    file: state=link force=yes src=/root/config/ansible/dotfiles/vimrc dest=~/.vimrc
-  - name: set ~/.vimrc_add
-    file: state=link force=yes src=/root/config/ansible/dotfiles/vimrc_add dest=~/.vimrc_add
-  - name: ensure ~/.vimbackups directory
-    file: path=~/.vimbackups state=directory
-  - name: ensure vim is installed
-    apt: name=vim state=present
-
-  # Configure shell.
-  - name: set ~/.bashrc
-    file: state=link force=yes src=/root/config/ansible/dotfiles/bashrc dest=~/.bashrc
-  - name: set ~/.profile
-    file: state=link force=yes src=/root/config/ansible/dotfiles/profile dest=~/.profile
-  - name: set ~/.shinit
-    file: state=link force=yes src=/root/config/ansible/dotfiles/shinit dest=~/.shinit
-  - name: set ~/.shinit_color
-    file: state=link force=yes src=/root/config/ansible/dotfiles/shinit_color dest=~/.shinit_color
+  # Config user.
+  - name: create user plom with sudo privileges and bash shell
+    user: name=plom groups=sudo shell=/bin/bash
+  - name: have config repo in user directory
+    git: repo=https://github.com/plomlompom/config dest=/home/plom/config
+    become_user: plom
+    become_method: su
 
-  # Set up git.
-  - name: set ~/.gitconfig
-    file: state=link force=yes src=/root/config/ansible/dotfiles/gitconfig dest=~/.gitconfig
-  - name: ensure git is installed
-    apt: name=git state=present
+  # Ensure minimal X window environment.
+  - name: ensure minimal X window environment
+    apt: name={{item}} state=present
+    with_items:
+    - xserver-xorg
+    - xinit
+    - libpam-systemd # needed to start X as non-root
+  - name: ensure basic X tools
+    apt: name={{item}} state=present
+    with_items:
+    - xterm
+    - redshift 
+    - i3
+    - i3status
+    - dmenu