Use jotbe.common and jotbe.dev-tools roles, removed now obsolete tasks
This commit is contained in:
parent
18f196a8e0
commit
6d820db7f5
2 changed files with 8 additions and 33 deletions
|
@ -3,10 +3,6 @@
|
||||||
become: yes
|
become: yes
|
||||||
|
|
||||||
vars:
|
vars:
|
||||||
locales_gen:
|
|
||||||
- en_US.UTF-8
|
|
||||||
- de_DE.UTF-8
|
|
||||||
locales_default: de_DE.UTF-8
|
|
||||||
ansible_version: "2.9.4"
|
ansible_version: "2.9.4"
|
||||||
pip_install_packages:
|
pip_install_packages:
|
||||||
- name: docker
|
- name: docker
|
||||||
|
@ -20,34 +16,6 @@
|
||||||
- vagrant
|
- vagrant
|
||||||
|
|
||||||
pre_tasks:
|
pre_tasks:
|
||||||
- name: Generate locals
|
|
||||||
locale_gen:
|
|
||||||
name: "{{ item }}"
|
|
||||||
state: present
|
|
||||||
loop: "{{ locales_gen }}"
|
|
||||||
|
|
||||||
- name: Get current locale
|
|
||||||
command: localectl status
|
|
||||||
register: locale_status
|
|
||||||
changed_when: false
|
|
||||||
|
|
||||||
- name: Extract LANG from current locale configuration
|
|
||||||
set_fact:
|
|
||||||
locale_lang: "{{ locale_status.stdout | regex_search('LANG=([^\n]+)', '\\1') | first }}"
|
|
||||||
|
|
||||||
- debug:
|
|
||||||
msg: "{{ locale_lang }}"
|
|
||||||
|
|
||||||
- name: Set default locale
|
|
||||||
command: localectl set-locale LANG={{ locales_default }}
|
|
||||||
when: locale_lang != locales_default
|
|
||||||
|
|
||||||
- name: Replace US repo with DE mirror
|
|
||||||
replace:
|
|
||||||
path: /etc/apt/sources.list
|
|
||||||
regexp: 'us(\.archive\.ubuntu\.com)'
|
|
||||||
replace: 'de\1'
|
|
||||||
|
|
||||||
- name: Install Python3
|
- name: Install Python3
|
||||||
raw: test -e /usr/bin/python3 || (apt update && apt install -y --force-yes python3)
|
raw: test -e /usr/bin/python3 || (apt update && apt install -y --force-yes python3)
|
||||||
changed_when: false
|
changed_when: false
|
||||||
|
@ -97,5 +65,7 @@
|
||||||
when: desktop_installed.changed
|
when: desktop_installed.changed
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
|
- jotbe.common
|
||||||
- geerlingguy.pip
|
- geerlingguy.pip
|
||||||
- geerlingguy.docker
|
- geerlingguy.docker
|
||||||
|
- jotbe.dev-tools
|
|
@ -5,3 +5,8 @@
|
||||||
- name: jotbe.common
|
- name: jotbe.common
|
||||||
src: https://git.jotbe.io/jotbe/ansible-role-common.git
|
src: https://git.jotbe.io/jotbe/ansible-role-common.git
|
||||||
scm: git
|
scm: git
|
||||||
|
|
||||||
|
- name: jotbe.dev-tools
|
||||||
|
src: https://git.jotbe.io/jotbe/ansible-role-dev-tools.git
|
||||||
|
scm: git
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue