Merge branch 'master' of https://github.com/glenux/ansible-role-glenux-basesystem
This commit is contained in:
commit
cb2b8be90a
4 changed files with 55 additions and 0 deletions
|
@ -1,2 +1,5 @@
|
||||||
---
|
---
|
||||||
# handlers file for glenux.basesystem
|
# handlers file for glenux.basesystem
|
||||||
|
- name: Update APT cache
|
||||||
|
apt: update_cache=yes
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,10 @@
|
||||||
- tmux
|
- tmux
|
||||||
- vim
|
- vim
|
||||||
- vim-gtk
|
- vim-gtk
|
||||||
|
- kate
|
||||||
|
- kdevelop
|
||||||
|
- umbrello
|
||||||
|
- umlet
|
||||||
- xutils
|
- xutils
|
||||||
- curl
|
- curl
|
||||||
- mercurial
|
- mercurial
|
||||||
|
|
|
@ -1,4 +1,38 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
|
- template:
|
||||||
|
src=apt_conf_glenuxnet_base.j2
|
||||||
|
dest=/etc/apt/apt.conf.d/00glenuxnet_base
|
||||||
|
owner=root
|
||||||
|
group=root
|
||||||
|
mode=0644
|
||||||
|
|
||||||
|
# Debian normal
|
||||||
|
- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ stable main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ stable main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
|
||||||
|
- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ testing main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ testing main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
|
||||||
|
- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ unstable main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ unstable main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
|
||||||
|
# Debian security
|
||||||
|
- apt_repository: repo='deb http://security.debian.org/ stable/updates main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
- apt_repository: repo='deb-src http://security.debian.org/ stable/updates main contrib non-free' state=present
|
||||||
|
notify: ['Update APT cache']
|
||||||
|
|
||||||
|
# Debian stable-update (ex-volatile)
|
||||||
|
- apt_repository: repo='deb http://ftp.fr.debian.org/debian/ stable-updates main contrib non-free' state=present
|
||||||
|
- apt_repository: repo='deb-src http://ftp.fr.debian.org/debian/ stable-updates main contrib non-free' state=present
|
||||||
|
|
||||||
- include: system.yml
|
- include: system.yml
|
||||||
- include: desktop.yml
|
- include: desktop.yml
|
||||||
- include: shopping.yml
|
- include: shopping.yml
|
||||||
|
@ -8,3 +42,4 @@
|
||||||
- include: office.yml
|
- include: office.yml
|
||||||
- include: security.yml
|
- include: security.yml
|
||||||
- include: shell.yml
|
- include: shell.yml
|
||||||
|
|
||||||
|
|
13
templates/apt_conf_glenuxnet_base.j2
Normal file
13
templates/apt_conf_glenuxnet_base.j2
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
Apt::Default-Release "{{ basesystem_release }}";
|
||||||
|
|
||||||
|
APT
|
||||||
|
{
|
||||||
|
Architecture "{{ basesystem_arch }}";
|
||||||
|
|
||||||
|
Get
|
||||||
|
{
|
||||||
|
Assume-Yes "false";
|
||||||
|
Fix-Broken "true";
|
||||||
|
AllowUnauthenticated "false";
|
||||||
|
};
|
||||||
|
};
|
Loading…
Reference in a new issue