Skip to content

Commit

Permalink
add dedicated debian repo profile
Browse files Browse the repository at this point in the history
  • Loading branch information
evgeni committed Aug 28, 2024
1 parent 54f1e88 commit 3e6f3ee
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 13 deletions.
14 changes: 14 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,18 @@ Vagrant.configure("2") do |config|
provider.vm.box_url = CENTOS_9_BOX_URL
end
end

config.vm.define "repo-deb" do |override|
override.vm.hostname = "repo-deb"
override.vm.box = "centos/stream9"

override.vm.provider "libvirt" do |libvirt, provider|
libvirt.memory = "2048"
libvirt.machine_virtual_size = 40
provider.vm.box_url = CENTOS_9_BOX_URL
end
override.vm.provision "install freight", type: "shell", inline: <<-SHELL
dnf install -y https://kojipkgs.fedoraproject.org//packages/freight/0.3.13/9.el9/noarch/freight-0.3.13-9.el9.noarch.rpm
SHELL
end
end
2 changes: 2 additions & 0 deletions puppet/data/vagrant.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ profiles::jenkins::node::swap_size_mb: 0

profiles::web::https: false

profiles::repo::deb::https: false

redmine::https: false
5 changes: 5 additions & 0 deletions puppet/manifests/site.pp
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,8 @@
include profiles::base
include profiles::web
}

node /^repo-deb\d+\.[a-z]+\.theforeman\.org$/ {
include profiles::base
include profiles::repo::deb
}
12 changes: 0 additions & 12 deletions puppet/modules/freight/manifests/init.pp
Original file line number Diff line number Diff line change
@@ -1,17 +1,5 @@
# @summary install freight
class freight {
if $facts['os']['family'] == 'Debian' {
apt::source { 'freight':
location => 'http://build.openvpn.net/debian/freight_team',
repos => 'main',
key => {
id => '30EBF4E73CCE63EEE124DD278E6DA8B4E158C569',
source => 'https://swupdate.openvpn.net/repos/repo-public.gpg',
},
before => Package['freight'],
}
}

package { 'freight':
ensure => 'installed',
}
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/freight/manifests/user.pp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
owner => 'root',
group => 'root',
mode => '0644',
content => epp("${module_name}/${vhost}-HEADER.html.epp", { 'stable' => $profiles::web::stable }),
content => epp("${module_name}/${vhost}-HEADER.html.epp", { 'stable' => $web::vhost::deb::stable }),
}
file { "${webdir}/foreman.asc":
ensure => link,
Expand Down
24 changes: 24 additions & 0 deletions puppet/modules/profiles/manifests/repo/deb.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# @summary A profile for the debian repo machines
#
# @param https
# Whether to enable HTTPS. This is typically wanted but can only be enabled
# in a 2 pass setup. First Apache needs to run for Letsencrypt to function.
# Then Letsencrypt can be enabled. Also useful to turn off in test setups.
class profiles::repo::deb (
Boolean $https = true,
String[1] $stable = '3.11',
) {
class { 'web':
https => $https,
}
contain web

contain web::vhost::archivedeb

class { 'web::vhost::deb':
stable => $stable,
}
contain web::vhost::deb

contain web::vhost::stagingdeb
}
3 changes: 3 additions & 0 deletions puppet/modules/profiles/manifests/web.pp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@

contain web::vhost::archivedeb

class { 'web::vhost::deb':
stable => $stable,
}
contain web::vhost::deb

class { 'web::vhost::debugs':
Expand Down
1 change: 1 addition & 0 deletions puppet/modules/web/manifests/vhost/deb.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# @summary Set up the deb vhost
# @api private
class web::vhost::deb (
String[1] $stable,
String $user = 'freight',
Stdlib::Absolutepath $home = "/home/${user}",
) {
Expand Down
4 changes: 4 additions & 0 deletions vagrant/manifests/default.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@
node /^discourse.*/ {
include profiles::discourse
}

node /^repo-deb.*/ {
include profiles::repo::deb
}

0 comments on commit 3e6f3ee

Please sign in to comment.