Skip to content

Commit

Permalink
Various fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
cytopia committed Nov 7, 2018
1 parent 7cc6a91 commit ab81564
Show file tree
Hide file tree
Showing 84 changed files with 297 additions and 304 deletions.
3 changes: 2 additions & 1 deletion ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[defaults]
roles_path = ./roles
remote_user = root
#remote_user = root
host_key_checking = False
gathering = smart
forks = 50
timeout = 10
retry_files_enabled = False
remote_tmp = /tmp

[ssh_connection]
pipelining = True
Expand Down
38 changes: 19 additions & 19 deletions group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ systemd_disabled: []
###
### System Python versions
###
python_2: yes
python_3: yes
python_2: True
python_3: True


###
Expand Down Expand Up @@ -125,11 +125,11 @@ docker_repo_channel: stable

# ---- FZF ----
# Add sourcing ~/.fzf.bash to your normal shell config?
fzf_update_rc: Yes
fzf_update_rc: True
# Enable/Disable fuzzy completion (bash & zsh)?
fzf_completion: No
fzf_completion: False
# Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)?
fzf_key_bindings: No
fzf_key_bindings: False

# ---- HipChat ----
# 'wheezy', 'jessie', 'stretch' or 'buster'
Expand All @@ -138,17 +138,17 @@ hipchat_repo_dist: stretch
# ---- LXDM ----
lxdm_dpi: 96
lxdm_gtk_theme: Industrial
lxdm_show_user_list: no
lxdm_show_user_list: False

# ---- NetworkManager ----
network_manager_nm_applet: Yes
network_manager_plugin_openvpn: Yes
network_manager_plugin_l2tp: No
network_manager_plugin_openconnect: No
network_manager_plugin_pptp: No
network_manager_plugin_ssh: No
network_manager_plugin_strongswan: No
network_manager_plugin_vpnc: No
network_manager_nm_applet: True
network_manager_plugin_openvpn: True
network_manager_plugin_l2tp: False
network_manager_plugin_openconnect: False
network_manager_plugin_pptp: False
network_manager_plugin_ssh: False
network_manager_plugin_strongswan: False
network_manager_plugin_vpnc: False

# ---- Skype ----
# 'stable' or 'unstable'
Expand All @@ -160,11 +160,11 @@ sublime_repo_channel: stable

# ---- sxiv ----
# Make sxiv default program for pictures
sxiv_default_image_viewer: yes
sxiv_default_image_viewer: True

# ---- Thunar ----
thunar_volman_enable: yes
thunar_archive_plugin_enable: yes
thunar_volman_enable: True
thunar_archive_plugin_enable: True

# ---- Thunderbird ----
thunderbird_ext_official: []
Expand All @@ -186,9 +186,9 @@ xorg_gpu: modesetting
# Supported values: 'XAA' 'EXA' 'UXA' 'SNA' 'glamor'
xorg_gpu_accel_method: glamor
# Enable VDPAU_DRIVER=va_gl systemwide
xorg_gpu_vdpau_va_gl_enable: yes
xorg_gpu_vdpau_va_gl_enable: True
# 'libinput' or 'synaptics'
xorg_touchpad_enable: yes
xorg_touchpad_enable: True
xorg_touchpad_driver: 'synaptics'


Expand Down
38 changes: 19 additions & 19 deletions host_vars/cytopia-t470p.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ systemd_disabled:
###
### System Python versions
###
python_2: yes
python_3: yes
python_2: True
python_3: True


###
Expand Down Expand Up @@ -266,26 +266,26 @@ docker_repo_channel: edge

# ---- FZF ----
# Add sourcing ~/.fzf.bash to your normal shell config?
fzf_update_rc: Yes
fzf_update_rc: True
# Enable/Disable fuzzy completion (bash & zsh)?
fzf_completion: No
fzf_completion: False
# Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)?
fzf_key_bindings: No
fzf_key_bindings: False

# ---- LXDM ----
lxdm_dpi: 128
lxdm_gtk_theme: Arc-Darker
lxdm_show_user_list: no
lxdm_show_user_list: False

# ---- NetworkManager ----
network_manager_nm_applet: Yes
network_manager_plugin_openvpn: Yes
network_manager_plugin_l2tp: No
network_manager_plugin_openconnect: No
network_manager_plugin_pptp: No
network_manager_plugin_ssh: No
network_manager_plugin_strongswan: No
network_manager_plugin_vpnc: No
network_manager_nm_applet: True
network_manager_plugin_openvpn: True
network_manager_plugin_l2tp: False
network_manager_plugin_openconnect: False
network_manager_plugin_pptp: False
network_manager_plugin_ssh: False
network_manager_plugin_strongswan: False
network_manager_plugin_vpnc: False

# ---- Skype ----
# 'stable' or 'unstable'
Expand All @@ -297,11 +297,11 @@ sublime_repo_channel: stable

# ---- sxiv ----
# Make sxiv default program for pictures
sxiv_default_image_viewer: yes
sxiv_default_image_viewer: True

# ---- Thunar ----
thunar_volman_enable: yes
thunar_archive_plugin_enable: yes
thunar_volman_enable: True
thunar_archive_plugin_enable: True

# ---- Thunderbird ----
thunderbird_ext_apt:
Expand All @@ -327,9 +327,9 @@ xorg_gpu: modesetting
# Supported values: 'XAA' 'EXA' 'UXA' 'SNA' 'glamor'
xorg_gpu_accel_method: glamor
# Enable VDPAU_DRIVER=va_gl systemwide
xorg_gpu_vdpau_va_gl_enable: yes
xorg_gpu_vdpau_va_gl_enable: True
# 'libinput' or 'synaptics'
xorg_touchpad_enable: yes
xorg_touchpad_enable: True
xorg_touchpad_driver: 'synaptics'


Expand Down
50 changes: 25 additions & 25 deletions host_vars/generic-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ debian_dist: buster
apt_repo_repositories:
# main
- file: debian-main
repo: "deb http://deb.debian.org/debian {{ debian_dist }} main"
repo: "deb http://deb.debian.org/debian {{ debian_dist }} main contrib non-free"
- file: debian-main
repo: "deb-src http://deb.debian.org/debian {{ debian_dist }} main"
repo: "deb-src http://deb.debian.org/debian {{ debian_dist }} main contrib non-free"
# updates
- file: debian-updates
repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main"
repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free"
- file: debian-updates
repo: "deb-src http://deb.debian.org/debian {{ debian_dist }}-updates main"
repo: "deb-src http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free"
# security
- file: debian-security
repo: "deb http://security.debian.org {{ debian_dist }}/updates main"
repo: "deb http://security.debian.org {{ debian_dist }}/updates main contrib non-free"
- file: debian-security
repo: "deb-src http://security.debian.org {{ debian_dist }}/updates main"
repo: "deb-src http://security.debian.org {{ debian_dist }}/updates main contrib non-free"


###
Expand All @@ -39,8 +39,8 @@ systemd_disabled: []
###
### System Python versions
###
python_2: yes
python_3: yes
python_2: True
python_3: True


###
Expand Down Expand Up @@ -131,11 +131,11 @@ docker_repo_channel: edge

# ---- FZF ----
# Add sourcing ~/.fzf.bash to your normal shell config?
fzf_update_rc: Yes
fzf_update_rc: True
# Enable/Disable fuzzy completion (bash & zsh)?
fzf_completion: No
fzf_completion: False
# Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)?
fzf_key_bindings: No
fzf_key_bindings: False

# ---- HipChat ----
# 'wheezy', 'jessie', 'stretch' or 'buster'
Expand All @@ -144,17 +144,17 @@ hipchat_repo_dist: "{{ debian_dist }}"
# ---- LXDM ----
lxdm_dpi: 96
lxdm_gtk_theme: Industrial
lxdm_show_user_list: no
lxdm_show_user_list: False

# ---- NetworkManager ----
network_manager_nm_applet: Yes
network_manager_plugin_openvpn: Yes
network_manager_plugin_l2tp: Yes
network_manager_plugin_openconnect: Yes
network_manager_plugin_pptp: Yes
network_manager_plugin_ssh: Yes
network_manager_plugin_strongswan: Yes
network_manager_plugin_vpnc: Yes
network_manager_nm_applet: True
network_manager_plugin_openvpn: True
network_manager_plugin_l2tp: True
network_manager_plugin_openconnect: True
network_manager_plugin_pptp: True
network_manager_plugin_ssh: True
network_manager_plugin_strongswan: True
network_manager_plugin_vpnc: True

# ---- Skype ----
# 'stable' or 'unstable'
Expand All @@ -166,11 +166,11 @@ sublime_repo_channel: stable

# ---- sxiv ----
# Make sxiv default program for pictures
sxiv_default_image_viewer: yes
sxiv_default_image_viewer: True

# ---- Thunar ----
thunar_volman_enable: yes
thunar_archive_plugin_enable: yes
thunar_volman_enable: True
thunar_archive_plugin_enable: True

# ---- Thunderbird ----
thunderbird_ext_official: []
Expand All @@ -192,9 +192,9 @@ xorg_gpu: modesetting
# Supported values: 'XAA' 'EXA' 'UXA' 'SNA' 'glamor'
xorg_gpu_accel_method: glamor
# Enable VDPAU_DRIVER=va_gl systemwide
xorg_gpu_vdpau_va_gl_enable: yes
xorg_gpu_vdpau_va_gl_enable: True
# 'libinput' or 'synaptics'
xorg_touchpad_enable: yes
xorg_touchpad_enable: True
xorg_touchpad_driver: 'synaptics'


Expand Down
7 changes: 0 additions & 7 deletions roles/apt-meta/handlers/main.yml

This file was deleted.

19 changes: 9 additions & 10 deletions roles/apt-meta/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,23 @@

#- name: ensure apt cache is up to date
# apt:
# force_apt_get: yes
# update_cache: yes
# force_apt_get: True
# update_cache: True
# cache_valid_time: 3600
# become: yes
# changed_when: False
# check_mode: False
# become: True

- name: ensure apt packages are managed
apt:
state: "{{ apt_state }}"
name: "{{ packages }}"
autoclean: yes
autoremove: yes
force_apt_get: yes
update_cache: yes
autoclean: True
autoremove: True
force_apt_get: True
update_cache: True
cache_valid_time: 3600
install_recommends: no
install_recommends: False
vars:
packages: "{{ apt_packages }}"
become: yes
#notify: clean apt
become: True
4 changes: 2 additions & 2 deletions roles/apt-repo-meta/handlers/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
- name: update apt repository cache
apt:
cache_valid_time: 1
update_cache: yes
become: yes
update_cache: True
become: True
18 changes: 9 additions & 9 deletions roles/apt-repo-meta/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
apt:
state: latest
name: "{{ apt_repo_packages }}"
update_cache: yes
install_recommends: no
become: yes
update_cache: True
install_recommends: False
become: True

- name: ensure default sources.list is removed
file:
state: absent
path: /etc/apt/sources.list
become: yes
become: True
notify: update apt repository cache

- name: ensure apt keys are managed
Expand All @@ -22,8 +22,8 @@
file: "{{ item.file | default(omit) }}"
keyserver: "{{ item.keyserver | default(omit) }}"
url: "{{ item.url | default(omit) }}"
validate_certs: yes
become: yes
validate_certs: True
become: True
with_items:
- "{{ apt_repo_keys }}"
notify: update apt repository cache
Expand All @@ -33,9 +33,9 @@
state: "{{ apt_repo_state }}"
repo: "{{ item.repo }}"
filename: "{{ item.file }}"
validate_certs: yes
update_cache: yes
become: yes
validate_certs: True
update_cache: True
become: True
with_items:
- "{{ apt_repo_repositories }}"
notify: update apt repository cache
Expand Down
4 changes: 2 additions & 2 deletions roles/autorunner/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
url: https://raw.githubusercontent.com/cytopia/autorunner/master/autorunner
dest: "{{ autorunner_bin_path }}/autorunner"
mode: 0755
force: yes
force: True
timeout: 30
register: task_result
until: task_result is succeeded
retries: 10
delay: 5
become: yes
become: True
2 changes: 1 addition & 1 deletion roles/autorunner/tasks/uninstall.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
file:
state: absent
path: "{{ autorunner_bin_path }}/autorunner"
become: yes
become: True
Loading

0 comments on commit ab81564

Please sign in to comment.