Skip to content

Commit

Permalink
Update modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@mergwyn
mergwyn committed Dec 29, 2024
1 parent 12b9d88 commit 21dd1a9
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 73 deletions.
74 changes: 37 additions & 37 deletions .fixtures.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@ fixtures:
radarr:
repo: https://github.com/mergwyn/mergwyn-radarr
ref: main
unbound:
repo: https://github.com/voxpupuli/puppet-unbound
ref: master
webmin:
repo: https://github.com/rehanone/puppet-webmin
ref: master
Expand All @@ -53,7 +50,7 @@ fixtures:
ref: 1.5.0
alternatives:
repo: puppet/alternatives
ref: 5.1.0
ref: 6.0.0
archive:
repo: puppet/archive
ref: 7.1.0
Expand All @@ -68,13 +65,13 @@ fixtures:
ref: 6.0.1
augeasproviders_sysctl:
repo: puppet/augeasproviders_sysctl
ref: 3.2.0
ref: 3.3.0
autofs:
repo: puppet/autofs
ref: 9.0.0
cron:
repo: puppet/cron
ref: 4.1.0
ref: 5.0.0
dhcp:
repo: puppet/dhcp
ref: 6.1.0
Expand All @@ -86,43 +83,46 @@ fixtures:
ref: 5.0.0
keepalived:
repo: puppet/keepalived
ref: 4.0.0
ref: 5.1.0
kmod:
repo: puppet/kmod
ref: 4.0.1
ref: 4.1.0
unbound:
repo: puppet/unbound
ref: 7.0.0
apache:
repo: puppetlabs/apache
ref: 12.1.0
ref: 12.2.0
apt:
repo: puppetlabs/apt
ref: 9.4.0
ref: 10.0.0
augeas_core:
repo: puppetlabs/augeas_core
ref: 1.5.0
docker:
repo: puppetlabs/docker
ref: 10.0.1
ref: 10.1.0
firewall:
repo: puppetlabs/firewall
ref: 7.0.2
ref: 8.1.3
git:
repo: puppetlabs/git
ref: 0.5.0
inifile:
repo: puppetlabs/inifile
ref: 6.1.1
ref: 6.2.0
mailalias_core:
repo: puppetlabs/mailalias_core
ref: 1.1.0
ref: 1.2.0
mysql:
repo: puppetlabs/mysql
ref: 15.0.0
ref: 16.2.0
ntp:
repo: puppetlabs/ntp
ref: 10.1.0
ref: 11.0.0
postgresql:
repo: puppetlabs-postgresql
ref: 10.3.0
ref: 10.4.0
puppetdb:
repo: puppetlabs/puppetdb
ref: 8.1.0
Expand All @@ -137,7 +137,7 @@ fixtures:
ref: 2.5.0
stdlib:
repo: puppetlabs/stdlib
ref: 9.6.0
ref: 9.7.0
vcsrepo:
repo: puppetlabs/vcsrepo
ref: 6.1.0
Expand All @@ -149,43 +149,43 @@ fixtures:
ref: 2.1.0
logrotate:
repo: puppet/logrotate
ref: 7.0.2
ref: 7.1.0
nginx:
repo: puppet/nginx
ref: 6.0.1
php:
repo: puppet/php
ref: 10.1.0
ref: 10.2.0
postfix:
repo: puppet/postfix
ref: 4.4.0
ref: 5.0.0
puppetboard:
repo: puppet/puppetboard
ref: 10.0.0
ref: 11.0.0
python:
repo: puppet/python
ref: 7.3.0
ref: 7.4.0
r10k:
repo: puppet/r10k
ref: 12.2.0
ref: 14.0.0
selinux:
repo: puppet/selinux
ref: 4.1.0
ref: 5.0.0
systemd:
repo: puppet/systemd
ref: 7.1.0
ref: 8.0.0
unattended_upgrades:
repo: puppet/unattended_upgrades
ref: 8.1.0
ref: 8.2.0
zabbix:
repo: puppet/zabbix
ref: 10.0.0
ssh:
repo: saz/ssh
ref: 12.1.0
ref: 13.0.0
sudo:
repo: saz/sudo
ref: 8.0.0
ref: 9.0.0
timezone:
repo: saz/timezone
ref: 7.0.0
Expand All @@ -194,7 +194,7 @@ fixtures:
ref: 3.1.0
debconf:
repo: stm/debconf
ref: 6.0.0
ref: 6.1.0
libvirt:
repo: thias/libvirt
ref: 1.0.2
Expand All @@ -215,25 +215,25 @@ fixtures:
ref: 1.3.0
exec:
repo: puppetlabs/exec
ref: 3.0.0
ref: 3.1.0
chocolatey:
repo: puppetlabs/chocolatey
ref: 8.0.0
ref: 8.0.1
dism:
repo: puppetlabs/dism
ref: 1.3.1
registry:
repo: puppetlabs/registry
ref: 5.0.1
ref: 5.0.2
concat:
repo: puppetlabs/concat
ref: 9.0.2
ref: 9.1.0
scheduled_task:
repo: puppetlabs/scheduled_task
ref: 4.0.0
ref: 4.0.1
powershell:
repo: puppetlabs/powershell
ref: 6.0.0
ref: 6.0.1
pwshlib:
repo: puppetlabs/pwshlib
ref: 1.1.1
ref: 1.2.2
67 changes: 32 additions & 35 deletions Puppetfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,59 +16,56 @@ mod 'mergwyn/ddclient', :git => 'https://github.com/mergwyn/puppet-ddclient'
mod 'mergwyn/jackett', :git => 'https://github.com/mergwyn/mergwyn-jackett'
mod 'mergwyn/radarr', :git => 'https://github.com/mergwyn/mergwyn-radarr', :branch => 'main'
mod 'mosen/cups', '1.5.0'
mod 'puppet/alternatives', '5.1.0'
mod 'puppet/alternatives', '6.0.0'
mod 'puppet/archive', '7.1.0'
mod 'puppet/augeasproviders_core', '4.1.0'
mod 'puppet/augeasproviders_pam', '4.0.0'
mod 'puppet/augeasproviders_shellvar', '6.0.1'
mod 'puppet/augeasproviders_sysctl', '3.2.0'
mod 'puppet/augeasproviders_sysctl', '3.3.0'
mod 'puppet/autofs', '9.0.0'
mod 'puppet/cron', '4.1.0'
mod 'puppet/cron', '5.0.0'
mod 'puppet/dhcp', '6.1.0'
mod 'puppet/epel', '5.0.0'
mod 'puppet/firewalld', '5.0.0'
mod 'puppet/keepalived', '5.1.0'
mod 'puppet/kmod', '4.0.1'
mod 'puppetlabs/apache', '12.1.0'
mod 'puppetlabs/apt', '9.4.0'
mod 'puppet/kmod', '4.1.0'
mod 'puppetlabs/apache', '12.2.0'
mod 'puppetlabs/apt', '10.0.0'
mod 'puppetlabs/augeas_core', '1.5.0'
# TODO woraround for https://github.com/puppetlabs/puppetlabs-docker/issues/870
#mod 'puppetlabs/docker', '5.1.0'
mod 'puppetlabs/docker', :git => 'https://github.com/mergwyn/puppetlabs-docker', :branch => 'fuse-overlayfs'
mod 'puppetlabs/firewall', '8.0.2'
mod 'puppetlabs/docker', '10.1.0'
mod 'puppetlabs/firewall', '8.1.3'
mod 'puppetlabs/git', '0.5.0'
mod 'puppetlabs/inifile', '6.1.1'
mod 'puppetlabs/inifile', '6.2.0'
mod 'puppetlabs/mailalias_core', '1.2.0'
mod 'puppetlabs/mysql', '15.0.0'
mod 'puppetlabs/ntp', '10.1.0'
mod 'puppetlabs/postgresql', '10.3.0'
mod 'puppetlabs/mysql', '16.2.0'
mod 'puppetlabs/ntp', '11.0.0'
mod 'puppetlabs/postgresql', '10.4.0'
mod 'puppetlabs/puppetdb', '8.1.0'
mod 'puppetlabs/puppetserver_gem', '1.1.1'
mod 'puppetlabs/reboot', '5.0.0'
mod 'puppetlabs/sshkeys_core', '2.5.0'
mod 'puppetlabs/stdlib', '9.6.0'
mod 'puppetlabs/stdlib', '9.7.0'
mod 'puppetlabs/vcsrepo', '6.1.0'
mod 'puppetlabs/xinetd', '3.4.1'
mod 'puppetlabs/yumrepo_core', '2.1.0'
#mod 'puppet/letsencrypt', '9.2.0'
mod 'puppet-logrotate', '7.0.2'
mod 'puppet-logrotate', '7.1.0'
mod 'puppet/nginx', '6.0.1'
mod 'puppet/php', '10.2.0'
mod 'puppet/postfix', '4.4.0'
mod 'puppet/puppetboard', '10.0.0'
mod 'puppet/python', '7.3.0'
mod 'puppet/r10k', '13.0.0'
mod 'puppet/selinux', '4.1.0'
mod 'puppet/systemd', '7.1.0'
mod 'puppet/unattended_upgrades', '8.1.0'
#mod 'puppet/unbound', '4.0.1' # Waiting for PR #287
mod 'puppet/unbound', :git => 'https://github.com/voxpupuli/puppet-unbound'
mod 'puppet/postfix', '5.0.0'
mod 'puppet/puppetboard', '11.0.0'
mod 'puppet/python', '7.4.0'
mod 'puppet/r10k', '14.0.0'
mod 'puppet/selinux', '5.0.0'
mod 'puppet/systemd', '8.0.0'
mod 'puppet/unattended_upgrades', '8.2.0'
mod 'puppet/unbound', '7.0.0'
mod 'puppet/zabbix', '10.0.0'
mod 'saz/ssh', '12.1.0'
mod 'saz/sudo', '8.0.0'
mod 'saz/ssh', '13.0.0'
mod 'saz/sudo', '9.0.0'
mod 'saz/timezone', '7.0.0'
mod 'sgnl05/sssd', '3.1.0'
mod 'stm/debconf', '6.0.0'
mod 'stm/debconf', '6.1.0'
mod 'thekevjames/homebrew', '1.9.1'
mod 'thias/libvirt', '1.0.2'

Expand All @@ -84,13 +81,13 @@ mod 'puppetlabs/mount_core', '1.3.0'
mod 'puppetlabs/cron_core', '1.3.0'

# tasks
mod 'puppetlabs/exec', '3.0.0'
mod 'puppetlabs/exec', '3.1.0'

# windows
mod 'puppetlabs/chocolatey', '8.0.0'
mod 'puppetlabs/chocolatey', '8.0.1'
mod 'puppetlabs/dism', '1.3.1'
mod 'puppetlabs/registry', '5.0.1'
mod 'puppetlabs/concat', '9.0.2'
mod 'puppetlabs/scheduled_task', '4.0.0'
mod 'puppetlabs/powershell', '6.0.0'
mod 'puppetlabs/pwshlib', '1.1.1'
mod 'puppetlabs/registry', '5.0.2'
mod 'puppetlabs/concat', '9.1.0'
mod 'puppetlabs/scheduled_task', '4.0.1'
mod 'puppetlabs/powershell', '6.0.1'
mod 'puppetlabs/pwshlib', '1.2.2'
2 changes: 1 addition & 1 deletion site-modules/profile/manifests/app/keepalived/vpn.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
auth_pass => lookup('secrets::keepalived'),
virtual_ipaddress => [ $v_cidr ],
track_interface => [ $wan, "${vpn} weight 5"], # optional, monitor these interfaces.
track_script => 'ping_google',
track_script => [ 'ping_google' ],
}

# Add virtual server for DNS
Expand Down

0 comments on commit 21dd1a9

Please sign in to comment.