Skip to content

Commit b943175

Browse files
miguelcastilhomiguelcastilho
authored
Merge pull request #34 from miguelcastilho/feature/integration
Feature/integration
2 parents f4fd90d + 6b8b717 commit b943175

16 files changed

+57
-27
lines changed

‎.github/workflows/lint.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
---
22
name: Lint
33
on:
4-
push: null
5-
pull_request: null
4+
pull_request:
5+
branches:
6+
- main
67
permissions: {}
78
jobs:
89
build:
@@ -18,6 +19,6 @@ jobs:
1819
with:
1920
fetch-depth: 0
2021
- name: Super-linter
21-
uses: super-linter/super-linter@v7.2.1
22+
uses: super-linter/super-linter@v7.3.0
2223
env:
2324
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

‎CONTRIBUTING.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Contributing to HomeServeMate
1+
# Contributing to DomoTron
22

3-
Thank you for considering contributing to HomeServeMate! We welcome contributions from the community and are grateful for your support. To ensure a smooth process, please follow the guidelines below.
3+
Thank you for considering contributing to DomoTron! We welcome contributions from the community and are grateful for your support. To ensure a smooth process, please follow the guidelines below.
44

55
## Table of Contents
66

@@ -16,7 +16,7 @@ Thank you for considering contributing to HomeServeMate! We welcome contribution
1616

1717
## Code of Conduct
1818

19-
This project and everyone participating in it is governed by the [HomeServeMate Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [email](miguelcastilhodias@gmail.com).
19+
This project and everyone participating in it is governed by the [DomoTron Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [email](miguelcastilhodias@gmail.com).
2020

2121
## How Can I Contribute?
2222

@@ -31,7 +31,7 @@ If you encounter a bug, please open an issue on GitHub with the following inform
3131

3232
### Suggesting Enhancements
3333

34-
We welcome suggestions to improve HomeServeMate. Please open an issue on GitHub with the following details:
34+
We welcome suggestions to improve DomoTron. Please open an issue on GitHub with the following details:
3535

3636
- A clear and descriptive title.
3737
- A detailed explanation of the enhancement and why it would be useful.
@@ -72,4 +72,4 @@ Thank you for your contributions!
7272

7373
---
7474

75-
By contributing to this project, you agree to abide by the HomeServeMate [Code of Conduct](CODE_OF_CONDUCT.md).
75+
By contributing to this project, you agree to abide by the DomoTron [Code of Conduct](CODE_OF_CONDUCT.md).

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# HomeServeMate
1+
# DomoTron
22

33
## Overview
44

5-
HomeServeMate is a project designed to automate the deployment and configuration of infrastructure on Proxmox using Terraform and Ansible. The Terraform scripts are used to provision the infrastructure, while Ansible is utilized to configure virtual machines (VMs) and Linux containers (LXC).
5+
DomoTron is a project designed to automate the deployment and configuration of infrastructure on Proxmox using Terraform and Ansible. The Terraform scripts are used to provision the infrastructure, while Ansible is utilized to configure virtual machines (VMs) and Linux containers (LXC).
66

77
## Table of Contents
88

@@ -27,8 +27,8 @@ Before you begin, ensure you have the following installed:
2727
1. **Clone the Repository:**
2828

2929
```bash
30-
git clone https://github.com/yourusername/HomeServeMate.git
31-
cd HomeServeMate
30+
git clone https://github.com/yourusername/DomoTron.git
31+
cd DomoTron
3232
```
3333

3434
2. **Set Up Environment Variables:**

‎ansible/mediabox.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
- name: Install dependencies
2525
ansible.builtin.include_role:
26-
name: dependencies
26+
name: mediabox
2727

2828
- name: Set up and mount disk
2929
become: true

‎ansible/proxmox.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
- name: Apply fix to Intel NIC e1000e hardware unit hang
3+
hosts: pve
4+
gather_facts: no
5+
any_errors_fatal: true
6+
tasks:
7+
- name: Append post-up command to iface eno1 inet manual
8+
ansible.builtin.lineinfile:
9+
path: /etc/network/interfaces
10+
insertafter: "^iface eno1 inet manual"
11+
line: " post-up ethtool -K eno1 tso off gso off"
12+
state: present
13+
notify: Restart networking
14+
15+
handlers:
16+
- name: Restart networking
17+
ansible.builtin.service:
18+
name: networking
19+
state: restarted
20+
enabled: yes

‎ansible/requirements.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
collections:
33
- name: ansible.utils
4-
version: 2.11.0
4+
version: 5.1.2
55
- name: community.general
6-
version: 8.6.9
6+
version: 10.4.0
77
- name: community.docker
8-
version: 4.3.0
8+
version: 4.4.0
99
- name: ansible.posix
1010
version: 2.0.0

‎ansible/roles/apps/templates/apps/homeassistant.yml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
reservations:
1212
memory: "268435456"
1313
hostname: homeassistant
14-
image: homeassistant/home-assistant:2025.1
14+
image: homeassistant/home-assistant:2025.2
1515
labels:
1616
icon: https://cdn.icon-icons.com/icons2/2407/PNG/512/home_assistant_icon_146164.png
1717
privileged: true

‎ansible/roles/apps/templates/apps/jellyfin.yml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ services:
1919
TZ: "{{ timezone }}"
2020
PUID: 1000
2121
PGID: 1000
22-
image: linuxserver/jellyfin:10.10.3
22+
image: linuxserver/jellyfin:10.10.6
2323
labels:
2424
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jellyfin-logo.png
2525
networks:

‎ansible/roles/apps/templates/apps/prowlarr.yml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
TZ: "{{ timezone }}"
1313
PUID: 1000
1414
PGID: 1000
15-
image: linuxserver/prowlarr:1.29.2
15+
image: linuxserver/prowlarr:1.31.2
1616
labels:
1717
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/prowlarr-logo.png
1818
networks:

‎ansible/roles/apps/templates/apps/radarr.yml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
TZ: "{{ timezone }}"
1313
PUID: 1000
1414
PGID: 1000
15-
image: linuxserver/radarr:5.17.2
15+
image: linuxserver/radarr:5.19.3
1616
labels:
1717
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr.png
1818
networks:

‎ansible/roles/apps/templates/apps/sonarr.yml.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- TZ="{{ timezone }}"
1313
- PUID=1000
1414
- PGID=1000
15-
image: linuxserver/sonarr:4.0.12
15+
image: linuxserver/sonarr:4.0.13
1616
labels:
1717
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/sonarr-icon.png
1818
ports:
@@ -46,7 +46,7 @@ services:
4646
- CRON_SCHEDULE=@daily
4747
- RECYCLARR_CREATE_CONFIG=true
4848
hostname: recyclarr
49-
image: ghcr.io/recyclarr/recyclarr:7.4.0
49+
image: ghcr.io/recyclarr/recyclarr:7.4.1
5050
labels:
5151
icon: https://recyclarr.dev/img/recyclarr.png
5252
restart: unless-stopped

‎ansible/roles/apps/templates/apps/zigbee2mqtt.yml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
environment:
1212
- "TZ={{ timezone }}"
1313
hostname: zigbee2mqtt
14-
image: koenkk/zigbee2mqtt:2.0.0
14+
image: koenkk/zigbee2mqtt:2.1.1
1515
labels:
1616
icon: https://raw.githubusercontent.com/mr-manuel/CasaOS-HomeAutomation-AppStore/latest/Apps/Zigbee2MQTT/icon.png
1717
ports:

‎ansible/roles/dependencies/tasks/folder_structure.yml ‎ansible/roles/mediabox/tasks/folder_structure.yml

File renamed without changes.

‎ansible/roles/dependencies/tasks/main.yml ‎ansible/roles/mediabox/tasks/main.yml

File renamed without changes.

‎terraform/providers.tf

+7-3
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,23 @@ terraform {
1212
}
1313
cloudflare = {
1414
source = "cloudflare/cloudflare"
15-
version = "4.50.0"
15+
version = "4.52.0"
1616
}
1717
random = {
1818
source = "hashicorp/random"
19-
version = "3.6.3"
19+
version = "3.7.1"
2020
}
2121
ansible = {
2222
source = "nbering/ansible"
2323
version = "1.0.4"
2424
}
2525
tailscale = {
2626
source = "tailscale/tailscale"
27-
version = "0.17.2"
27+
version = "0.18.0"
28+
}
29+
null = {
30+
source = "hashicorp/null"
31+
version = "3.2.3"
2832
}
2933
}
3034
}

‎terraform/proxmox_vm.tf

+6-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,9 @@ resource "proxmox_vm_qemu" "mediabox" {
5555
}
5656

5757

58-
58+
#### Proxmox host
59+
resource "null_resource" "execute_ansible_on_proxmox" {
60+
provisioner "local-exec" {
61+
command = "ansible-playbook -i ${var.ansible_inventory} ${var.ansible_playbooks.proxmox} --vault-password-file .vault_pass.txt"
62+
}
63+
}

0 commit comments

Comments
 (0)