Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/integration #34

Merged
merged 53 commits into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
aaefe76
Update dependency ansible.utils to v2.12.0
renovate[bot] Jan 21, 2025
e6d1dbe
Update dependency community.general to v10
renovate[bot] Jan 21, 2025
c5ed520
rename
miguelcastilho Jan 21, 2025
f4168b1
Merge pull request #4 from miguelcastilho/renovate/ansible.utils-2.x
miguelcastilho Jan 21, 2025
3cd787b
Update dependency ansible.utils to v5
renovate[bot] Jan 21, 2025
8711970
Merge pull request #6 from miguelcastilho/renovate/community.general-…
miguelcastilho Jan 21, 2025
077b0aa
Merge pull request #5 from miguelcastilho/renovate/ansible.utils-5.x
miguelcastilho Jan 21, 2025
7a7c4d4
Merge pull request #10 from miguelcastilho/patch/rename
miguelcastilho Jan 21, 2025
2126b1e
only triggers on pull request to feature/integratio
miguelcastilho Jan 21, 2025
c76d61b
Merge pull request #11 from miguelcastilho/feature/fix_actions
miguelcastilho Jan 21, 2025
52a6ed2
Update ghcr.io/recyclarr/recyclarr Docker tag to v7.4.1
renovate[bot] Feb 16, 2025
efafd84
Update linuxserver/jellyfin Docker tag to v10.10.5
renovate[bot] Feb 16, 2025
ed6b194
Update linuxserver/sonarr Docker tag to v4.0.13
renovate[bot] Feb 16, 2025
9c1dbe7
Update Terraform cloudflare to v4.52.0
renovate[bot] Feb 16, 2025
5371610
Update dependency community.docker to v4.4.0
renovate[bot] Feb 16, 2025
011bb4d
Update dependency community.general to v10.3.1
renovate[bot] Feb 16, 2025
93d6908
Update homeassistant/home-assistant Docker tag to v2025.2
renovate[bot] Feb 16, 2025
70ba76f
Update koenkk/zigbee2mqtt Docker tag to v2.1.1
renovate[bot] Feb 16, 2025
ed8e3c1
Update linuxserver/prowlarr Docker tag to v1.30.2
renovate[bot] Feb 16, 2025
db2320b
Update linuxserver/radarr Docker tag to v5.18.4
renovate[bot] Feb 16, 2025
88221a3
Merge pull request #12 from miguelcastilho/renovate/ghcr.io-recyclarr…
miguelcastilho Feb 16, 2025
25dce77
Merge pull request #21 from miguelcastilho/renovate/linuxserver-radar…
miguelcastilho Feb 16, 2025
3492189
Merge pull request #20 from miguelcastilho/renovate/linuxserver-prowl…
miguelcastilho Feb 16, 2025
672aa3e
Merge pull request #13 from miguelcastilho/renovate/linuxserver-jelly…
miguelcastilho Feb 16, 2025
d83b7e6
Merge pull request #18 from miguelcastilho/renovate/homeassistant-hom…
miguelcastilho Feb 16, 2025
361ce13
Merge pull request #19 from miguelcastilho/renovate/koenkk-zigbee2mqt…
miguelcastilho Feb 16, 2025
61dd3a1
Merge pull request #17 from miguelcastilho/renovate/community.general…
miguelcastilho Feb 16, 2025
d7d4509
Merge pull request #16 from miguelcastilho/renovate/community.docker-4.x
miguelcastilho Feb 16, 2025
47f4dba
Merge pull request #15 from miguelcastilho/renovate/cloudflare-4.x
miguelcastilho Feb 16, 2025
c20fa45
Update Terraform cloudflare to v5
renovate[bot] Feb 16, 2025
8206295
Merge pull request #22 from miguelcastilho/renovate/cloudflare-5.x
miguelcastilho Feb 16, 2025
43a5494
Merge pull request #14 from miguelcastilho/renovate/linuxserver-sonar…
miguelcastilho Feb 16, 2025
da34e76
Revert "Update Terraform cloudflare to v5"
miguelcastilho Feb 16, 2025
84ddbfb
Merge pull request #23 from miguelcastilho/revert-22-renovate/cloudfl…
miguelcastilho Feb 16, 2025
01b78a6
Update linuxserver/jellyfin Docker tag to v10.10.6
renovate[bot] Feb 17, 2025
85431f3
Merge pull request #26 from miguelcastilho/renovate/linuxserver-jelly…
miguelcastilho Feb 19, 2025
94ef00d
Update linuxserver/prowlarr Docker tag to v1.31.2
renovate[bot] Feb 22, 2025
7db692a
Update dependency community.general to v10.4.0
renovate[bot] Feb 24, 2025
22ba908
Merge pull request #27 from miguelcastilho/renovate/linuxserver-prowl…
miguelcastilho Feb 24, 2025
0238b98
Update Terraform random to v3.7.1
renovate[bot] Feb 25, 2025
8b241fd
Update linuxserver/radarr Docker tag to v5.19.3
renovate[bot] Feb 25, 2025
6b30583
Update Terraform tailscale to v0.18.0
renovate[bot] Feb 26, 2025
612e6f5
Update super-linter/super-linter action to v7.3.0
renovate[bot] Feb 26, 2025
53e7666
Merge pull request #30 from miguelcastilho/renovate/linuxserver-radar…
miguelcastilho Feb 28, 2025
7107885
Merge pull request #32 from miguelcastilho/renovate/super-linter-supe…
miguelcastilho Feb 28, 2025
2d7786a
Merge pull request #31 from miguelcastilho/renovate/tailscale-0.x
miguelcastilho Feb 28, 2025
8377b31
Merge pull request #29 from miguelcastilho/renovate/random-3.x
miguelcastilho Feb 28, 2025
04cfb5f
Merge pull request #28 from miguelcastilho/renovate/community.general…
miguelcastilho Feb 28, 2025
0dd736c
rename folders
miguelcastilho Feb 28, 2025
a1f787e
fix intel nic
miguelcastilho Feb 28, 2025
a356acb
Merge branch 'main' into feature/integration
miguelcastilho Feb 28, 2025
5e13c03
change github action
miguelcastilho Feb 28, 2025
6b8b717
add provider
miguelcastilho Feb 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
---
name: Lint
on:
push: null
pull_request: null
pull_request:
branches:
- main
permissions: {}
jobs:
build:
Expand All @@ -18,6 +19,6 @@ jobs:
with:
fetch-depth: 0
- name: Super-linter
uses: super-linter/super-linter@v7.2.1
uses: super-linter/super-linter@v7.3.0
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributing to HomeServeMate
# Contributing to DomoTron

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.
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.

## Table of Contents

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

## Code of Conduct

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).
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).

## How Can I Contribute?

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

### Suggesting Enhancements

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

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

---

By contributing to this project, you agree to abide by the HomeServeMate [Code of Conduct](CODE_OF_CONDUCT.md).
By contributing to this project, you agree to abide by the DomoTron [Code of Conduct](CODE_OF_CONDUCT.md).
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# HomeServeMate
# DomoTron

## Overview

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).
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).

## Table of Contents

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

```bash
git clone https://github.com/yourusername/HomeServeMate.git
cd HomeServeMate
git clone https://github.com/yourusername/DomoTron.git
cd DomoTron
```

2. **Set Up Environment Variables:**
Expand Down
2 changes: 1 addition & 1 deletion ansible/mediabox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

- name: Install dependencies
ansible.builtin.include_role:
name: dependencies
name: mediabox

- name: Set up and mount disk
become: true
Expand Down
20 changes: 20 additions & 0 deletions ansible/proxmox.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
- name: Apply fix to Intel NIC e1000e hardware unit hang
hosts: pve
gather_facts: no
any_errors_fatal: true
tasks:
- name: Append post-up command to iface eno1 inet manual
ansible.builtin.lineinfile:
path: /etc/network/interfaces
insertafter: "^iface eno1 inet manual"
line: " post-up ethtool -K eno1 tso off gso off"
state: present
notify: Restart networking

handlers:
- name: Restart networking
ansible.builtin.service:
name: networking
state: restarted
enabled: yes
6 changes: 3 additions & 3 deletions ansible/requirements.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
---
collections:
- name: ansible.utils
version: 2.11.0
version: 5.1.2
- name: community.general
version: 8.6.9
version: 10.4.0
- name: community.docker
version: 4.3.0
version: 4.4.0
- name: ansible.posix
version: 2.0.0
2 changes: 1 addition & 1 deletion ansible/roles/apps/templates/apps/homeassistant.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
reservations:
memory: "268435456"
hostname: homeassistant
image: homeassistant/home-assistant:2025.1
image: homeassistant/home-assistant:2025.2
labels:
icon: https://cdn.icon-icons.com/icons2/2407/PNG/512/home_assistant_icon_146164.png
privileged: true
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/apps/templates/apps/jellyfin.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ services:
TZ: "{{ timezone }}"
PUID: 1000
PGID: 1000
image: linuxserver/jellyfin:10.10.3
image: linuxserver/jellyfin:10.10.6
labels:
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jellyfin-logo.png
networks:
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/apps/templates/apps/prowlarr.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
TZ: "{{ timezone }}"
PUID: 1000
PGID: 1000
image: linuxserver/prowlarr:1.29.2
image: linuxserver/prowlarr:1.31.2
labels:
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/prowlarr-logo.png
networks:
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/apps/templates/apps/radarr.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
TZ: "{{ timezone }}"
PUID: 1000
PGID: 1000
image: linuxserver/radarr:5.17.2
image: linuxserver/radarr:5.19.3
labels:
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr.png
networks:
Expand Down
4 changes: 2 additions & 2 deletions ansible/roles/apps/templates/apps/sonarr.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- TZ="{{ timezone }}"
- PUID=1000
- PGID=1000
image: linuxserver/sonarr:4.0.12
image: linuxserver/sonarr:4.0.13
labels:
icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/sonarr-icon.png
ports:
Expand Down Expand Up @@ -46,7 +46,7 @@ services:
- CRON_SCHEDULE=@daily
- RECYCLARR_CREATE_CONFIG=true
hostname: recyclarr
image: ghcr.io/recyclarr/recyclarr:7.4.0
image: ghcr.io/recyclarr/recyclarr:7.4.1
labels:
icon: https://recyclarr.dev/img/recyclarr.png
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/apps/templates/apps/zigbee2mqtt.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
environment:
- "TZ={{ timezone }}"
hostname: zigbee2mqtt
image: koenkk/zigbee2mqtt:2.0.0
image: koenkk/zigbee2mqtt:2.1.1
labels:
icon: https://raw.githubusercontent.com/mr-manuel/CasaOS-HomeAutomation-AppStore/latest/Apps/Zigbee2MQTT/icon.png
ports:
Expand Down
10 changes: 7 additions & 3 deletions terraform/providers.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,23 @@ terraform {
}
cloudflare = {
source = "cloudflare/cloudflare"
version = "4.50.0"
version = "4.52.0"
}
random = {
source = "hashicorp/random"
version = "3.6.3"
version = "3.7.1"
}
ansible = {
source = "nbering/ansible"
version = "1.0.4"
}
tailscale = {
source = "tailscale/tailscale"
version = "0.17.2"
version = "0.18.0"
}
null = {
source = "hashicorp/null"
version = "3.2.3"
}
}
}
Expand Down
7 changes: 6 additions & 1 deletion terraform/proxmox_vm.tf
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,9 @@ resource "proxmox_vm_qemu" "mediabox" {
}



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