aboutsummaryrefslogtreecommitdiff
path: root/personal_infra
diff options
context:
space:
mode:
Diffstat (limited to 'personal_infra')
-rw-r--r--personal_infra/README.md2
-rw-r--r--personal_infra/k8s/base/kustomization.yml1
-rw-r--r--personal_infra/playbooks/roles/coming_soon_rss/tasks/main.yaml11
-rw-r--r--personal_infra/playbooks/site.yaml12
-rw-r--r--personal_infra/puppet/modules/flexisip/manifests/init.pp8
-rw-r--r--personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp2
-rw-r--r--personal_infra/puppet/site/nagios.h1.int.pdp7.net.pp14
7 files changed, 17 insertions, 33 deletions
diff --git a/personal_infra/README.md b/personal_infra/README.md
index 42376e3f..0f2b3021 100644
--- a/personal_infra/README.md
+++ b/personal_infra/README.md
@@ -18,7 +18,6 @@ See [HACKING](HACKING.md) for more "usage" instructions.
* LXC container running Grafana
* LXC container running ClickHouse
* Two VMs running Talos, providing two Kubernetes clusters (production/test)
- * My blog
* Incarnator
* A CRUD system I run to track my weight
* Some other small projects
@@ -149,6 +148,7 @@ I use Talos Linux to run Kubernetes.
## My blog
See [blog](../blog).
+(Running on a tilde I'm setting up.)
## Phones
diff --git a/personal_infra/k8s/base/kustomization.yml b/personal_infra/k8s/base/kustomization.yml
index 111cc599..e13fbbbe 100644
--- a/personal_infra/k8s/base/kustomization.yml
+++ b/personal_infra/k8s/base/kustomization.yml
@@ -4,7 +4,6 @@ kind: Kustomization
resources:
- https://raw.githubusercontent.com/kubernetes/ingress-nginx/controller-v1.12.1/deploy/static/provider/cloud/deploy.yaml
- https://github.com/alexpdp7/talos-check/raw/main/manifest.yaml
- - https://raw.githubusercontent.com/alexpdp7/alexpdp7/master/blog/k8s.yaml
patches:
- patch: |-
diff --git a/personal_infra/playbooks/roles/coming_soon_rss/tasks/main.yaml b/personal_infra/playbooks/roles/coming_soon_rss/tasks/main.yaml
deleted file mode 100644
index b83749de..00000000
--- a/personal_infra/playbooks/roles/coming_soon_rss/tasks/main.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- uri:
- url: https://raw.githubusercontent.com/alexpdp7/coming-soon-rss/6708758549e1eaffd77a9ef556deeb4a283f5557/k8s.yaml
- return_content: true
- register: manifest
- delegate_to: 127.0.0.1
-- k8s:
- context: "{{ context }}"
- state: present
- definition: "{{ manifest.content | replace('coming-soon-rss.example.com', host) }}"
- delegate_to: 127.0.0.1
diff --git a/personal_infra/playbooks/site.yaml b/personal_infra/playbooks/site.yaml
index 2714bc77..73969cdf 100644
--- a/personal_infra/playbooks/site.yaml
+++ b/personal_infra/playbooks/site.yaml
@@ -72,15 +72,3 @@
- role: takahe
vars:
context: "admin@{{ talos_host.talos_cluster }}"
-
-- name: deploy coming-soon-rss
- hosts: k8s-prod.h1.int.pdp7.net
- tags:
- - k8s
- - coming-soon-rss
- gather_facts: false
- roles:
- - role: coming_soon_rss
- vars:
- context: "admin@{{ talos_host.talos_cluster }}"
- host: coming-soon-rss.k8s-prod.h1.int.pdp7.net
diff --git a/personal_infra/puppet/modules/flexisip/manifests/init.pp b/personal_infra/puppet/modules/flexisip/manifests/init.pp
index 9ed962de..a4836329 100644
--- a/personal_infra/puppet/modules/flexisip/manifests/init.pp
+++ b/personal_infra/puppet/modules/flexisip/manifests/init.pp
@@ -4,28 +4,28 @@ class flexisip($flexisip_sdp_port_range_min, $flexisip_sdp_port_range_max, $flex
# keep this repository enabled even if you enable beta/alpha repositories
[Belledonne-stable]
name=Belledonne-stable
- baseurl=http://www.linphone.org/snapshots/$contentdir/$releasever/stable
+ baseurl=https://download.linphone.org/snapshots/$contentdir/$releasever/stable
enabled=1
gpgcheck=0
# enable this if you want post-release patches
[Belledonne-hotfix]
name=Belledonne-hotfix
- baseurl=http://www.linphone.org/snapshots/$contentdir/$releasever/hotfix
+ baseurl=https://download.linphone.org/snapshots/$contentdir/$releasever/hotfix
enabled=1
gpgcheck=0
# enable this if you want next release beta packages
[Belledonne-beta]
name=Belledonne-beta
- baseurl=http://www.linphone.org/snapshots/$contentdir/$releasever/beta
+ baseurl=https://download.linphone.org/snapshots/$contentdir/$releasever/beta
enabled=0
gpgcheck=0
# enable this to have development (unstable) packages
[Belledonne-alpha]
name=Belledonne-alpha
- baseurl=http://www.linphone.org/snapshots/$contentdir/$releasever/alpha
+ baseurl=https://download.linphone.org/snapshots/$contentdir/$releasever/alpha
enabled=0
gpgcheck=0
| EOT
diff --git a/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp b/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp
index ec1b6300..f69a137f 100644
--- a/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp
+++ b/personal_infra/puppet/site/maelcum.mad.int.pdp7.net.pp
@@ -7,7 +7,7 @@ node 'maelcum.mad.int.pdp7.net' {
dhcp-host=d8:8c:79:1a:11:59,chromecast,10.34.10.3
host-record=maelcum.mad.int.pdp7.net,maelcum,10.34.10.2
- dhcp-option=tag:!noroutes,option:classless-static-route,192.168.76.0/24,10.34.10.2,10.43.43.0/24,10.34.10.2,10.17.19.0/24,10.34.10.2
+ dhcp-option=tag:!noroutes,option:classless-static-route,192.168.76.0/24,10.34.10.2,10.43.43.0/24,10.34.10.2,10.17.19.0/24,10.34.10.2,0.0.0.0/0,10.34.10.1
# Kobo
dhcp-host=a4:3c:d7:39:c6:29,set:noroutes
| EOT
diff --git a/personal_infra/puppet/site/nagios.h1.int.pdp7.net.pp b/personal_infra/puppet/site/nagios.h1.int.pdp7.net.pp
index ad6b102e..4d9dd8c6 100644
--- a/personal_infra/puppet/site/nagios.h1.int.pdp7.net.pp
+++ b/personal_infra/puppet/site/nagios.h1.int.pdp7.net.pp
@@ -36,10 +36,18 @@ node 'nagios.h1.int.pdp7.net' {
address => "192.168.76.3",
}
+ nagios_host {"xn--ix-yja.es":
+ use => 'generic-host',
+ max_check_attempts => 5,
+ contact_groups => 'admins',
+ check_command => 'check-host-alive',
+ address => '155.133.26.104',
+ }
+
nagios_service {'alex.corcoles.net-gemini-cert':
use => 'generic-service',
service_description => 'alex.corcoles.net-gemini-cert',
- host_name => 'k8s-prod.h1.int.pdp7.net',
+ host_name => 'xn--ix-yja.es',
check_command => 'check_alex.corcoles.net-gemini-cert',
require => Package['nagios'],
notify => Service['nagios'],
@@ -48,13 +56,13 @@ node 'nagios.h1.int.pdp7.net' {
nagios_command {'check_alex.corcoles.net-gemini-cert':
command_name => 'check_alex.corcoles.net-gemini-cert',
- command_line => '/usr/lib64/nagios/plugins/check_http -H alex.corcoles.net -C 10,5 -p 1965',
+ command_line => '/usr/lib64/nagios/plugins/check_ssl_validity -H alex.corcoles.net -I alex.corcoles.net -p 1965 -c 10 5',
require => Package['nagios'],
notify => Service['nagios'],
owner => 'nagios',
}
- package {'nagios-plugins-pgsql':}
+ package {['nagios-plugins-all', 'perl-Math-BigInt']:}
class {'otel':
version => '0.88.0',