Skip to content

Commit 470ed73

Browse files
author
Bill Meek
committed
rhosts.yml: remove --limit check when using rhosts
.*ignore: only ignore .sh in the top directory group_vars: Update README for group_vars comments: move URL comment from venv to missing devuan: add v6 packages (copy of v5) common: update user_options name: text ansible-lint: remove a noqa exception
1 parent 43b1cf2 commit 470ed73

File tree

8 files changed

+142
-28
lines changed

8 files changed

+142
-28
lines changed

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
.git
44
.github
55
.gitignore
6+
.sh
67
.yamllint.yml
7-
*.sh
88
*.setup.out
99
**.sw[nop]
1010
*~

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Part 3 of workflows:
22
.github/workflows/build-mythtv-all.yml
3+
.sh
34
Dockerfile
45
Docker
56
group_vars/user_options.yml
67
tags
78
rhosts.yml
89
*~
910
*.setup.out
10-
*.sh
1111
**.sw[nop]
1212
# If retry_files_enabled=False gets changed in ansible.cfg
1313
mythtv.retry

‎group_vars/README‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@ Variables set here will override those in the all.yml file in this
66
directory. The full Ansible precedence list can be found here:
77
https://docs.ansible.com/ansible/latest/playbook_guide/playbooks_variables.html
88

9-
Command line settings (like: --extra-vars='{"qt6": true}') would override settings
10-
here.
9+
Command line settings (E.g. --extra-vars='{"qt6": true}') would override
10+
settings here.
1111

12-
The contents of a user_options.yml file could contain things between the long
13-
underscore lines (which have the default values listed). Choose, and uncomment
14-
none, one, some or all.
12+
Copy the contents between the _____ lines below. Uncomment/change/delete as
13+
required.
1514
_______________________________________________________________________
1615

1716
---
1817

1918
# Set to true to enable use of the Single Role
20-
# use_old_roles: true
19+
# use_old_roles: false
2120

2221
# Set to true to create a Python Virtual Environment:
23-
# venv_active: true
22+
# venv_active: false
2423

2524
# Change the default Virtual Environment path to somewhere else:
2625
# venv_path: ~/.virtualenvs/mythtv
@@ -31,9 +30,10 @@ _______________________________________________________________________
3130
# Optional local packages. DANGER: No attempt is made to verify that additions
3231
# here available with the distribution in use.
3332

34-
#local_user_packages (there are no default packages):
35-
# - example1
36-
# - example2
33+
# Add packages as desired:
34+
#local_user_packages
35+
# - some_package
36+
# - another_package
3737

3838
...
3939

‎roles/common/tasks/main.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99

1010
---
1111

12-
- fail:
13-
msg: "Aborting play because the --limit switch wasn't used"
14-
when: ansible_limit is undefined
15-
16-
- fail:
17-
msg: "Aborting play because the --limit= switch was empty"
18-
when: not ansible_limit
19-
20-
- fail:
21-
msg: "Aborting play because --limit=all was used"
22-
when: ansible_limit == "all"
12+
- name: "Don't do limit checks if using rhosts.yml"
13+
when: inventory_file is not search("/rhosts.yml$")
14+
block:
15+
- fail:
16+
msg: "Aborting play because the --limit switch wasn't used"
17+
when: ansible_limit is undefined
18+
- fail:
19+
msg: "Aborting play because the --limit= switch was empty"
20+
when: not ansible_limit
21+
- fail:
22+
msg: "Aborting play because --limit=all was used"
23+
when: ansible_limit == "all"
2324

2425
- name: "{{ instruction_text }}:"
2526
debug:
@@ -45,7 +46,7 @@
4546
- "ansible_version.full: {{ ansible_version.full }}"
4647
when: ansible_lsb.major_release is undefined
4748

48-
- name: Load a user_options.yml file if it exists
49+
- name: Load user_options.yml
4950
include_vars:
5051
file: '{{ item }}'
5152
with_first_found:

‎roles/mythtv/tasks/main.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- files: '{{ ansible_pkg_mgr }}_{{ distro }}.yml'
2020
skip: true
2121

22-
- name: 'Load packages for: "{{ distro }}/{{ version }}"' # noqa name[template]
22+
- name: Load distribution/version packages.
2323
include_vars:
2424
file: '{{ item }}'
2525
with_first_found:

‎roles/mythtv/vars/devuan/6.yml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
# Not real, just a guess for release following v5. Package list NOT updated.
2+
# "ansible_distribution: Devuan",
3+
# "ansible_distribution_release: excalibur",
4+
# "ansible_distribution_major_version: 6",
5+
# "ansible_lsb.major_release: 6",
6+
# The current testing suite is planned for 2025+. Based on Debian Trixie (13).
7+
8+
---
9+
10+
packages:
11+
- git
12+
- g++
13+
- make
14+
- build-essential
15+
- nasm
16+
- automake
17+
- libtool
18+
- ccache
19+
- pkg-config
20+
- cmake
21+
- patch
22+
- ninja-build
23+
- gperf
24+
- meson
25+
- php
26+
- uuid-dev
27+
- libfreetype6-dev
28+
- libmp3lame-dev
29+
- libxv-dev
30+
- libxxf86vm-dev
31+
- libxinerama-dev
32+
- libxrandr-dev
33+
- libxml2-dev
34+
- libavahi-compat-libdnssd-dev
35+
- libexiv2-dev
36+
- libasound2-dev
37+
- libegl1-mesa-dev
38+
- liblzo2-dev
39+
- libhdhomerun-dev
40+
- libsamplerate0-dev
41+
- libxnvctrl-dev
42+
- libzip-dev
43+
- libmpeg2-4-dev
44+
- libsoundtouch-dev
45+
- libv4l-dev
46+
- libva-dev
47+
- libdrm-dev
48+
- libvdpau-dev
49+
- libass-dev
50+
- libxvidcore-dev
51+
- libx264-dev
52+
- libvpx-dev
53+
- libbluray-bdj
54+
- libavc1394-dev
55+
- libiec61883-dev
56+
- libpulse-dev
57+
- libfftw3-dev
58+
- libssl-dev
59+
- libgnutls28-dev
60+
- libdbi-perl
61+
- libdbd-mysql-perl
62+
- libnet-upnp-perl
63+
- libwww-perl
64+
- libio-socket-inet6-perl
65+
- libdate-manip-perl
66+
- libxml-simple-perl
67+
- libxml-xpath-perl
68+
- libimage-size-perl
69+
- libdatetime-format-iso8601-perl
70+
- libsoap-lite-perl
71+
- libjson-perl
72+
- libfindbin-libs-perl
73+
- perl-modules
74+
- libvorbis-dev
75+
- libflac-dev
76+
- libflac++-dev
77+
- libtag1-dev
78+
- libcdio-dev
79+
- libcdio-paranoia-dev
80+
- libtool-bin
81+
- sqlite3
82+
- libsqlite3-dev
83+
- libcec-dev
84+
- libbluray-dev
85+
- libx265-dev
86+
- default-libmysqlclient-dev
87+
- libmariadb-dev-compat
88+
- python3-oauthlib
89+
- python3-pycurl
90+
- python3-requests
91+
- python3-requests-cache
92+
- python3-lxml
93+
- python3-mysqldb
94+
- python3-setuptools
95+
- python3-venv
96+
- python3-virtualenv
97+
- python3-dev
98+
- python3-pip
99+
- libminizip-dev
100+
101+
qt5_packages:
102+
- libqt5core5a
103+
- libqt5opengl5-dev
104+
- libqt5script5
105+
- qtscript5-dev
106+
- qt5-qmake
107+
- libqt5sql5-mysql
108+
109+
qt6_packages:
110+
111+
...
112+
113+
# vim: set expandtab tabstop=2 shiftwidth=2 smartindent noautoindent colorcolumn=4:

‎roles/mythtv/vars/missing.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# This is used by ../tasks/main.yml to care for the case of missing package
44
# lists.
55

6+
##### BE SURE TO UPDATE THE following if the URL to the MythTV Ansible issues
7+
##### list changes!
8+
69
---
710

811
missing_package_message: >-

‎roles/python/tasks/python-venv.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
# Included by: roles/python/tasks/main.yml
22

3-
##### BE SURE TO UPDATE THE 'Error creating a new venv' task below if
4-
##### the url to the MythTV ansible issues list changes!
5-
63
---
74

85
- name: python-venv | Try to use discovered_interpreter_python

0 commit comments

Comments
 (0)