Skip to content

Commit

Permalink
fix(pkg): epel fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
SchoolGuy committed Nov 17, 2023
1 parent 1208325 commit ec2377a
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 14 deletions.
22 changes: 11 additions & 11 deletions cobbler/files/default/settings.yaml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ bootloaders_modules:
- gcry_rijndael
- gcry_sha1
- gcry_sha256
syslinux_dir: '@@syslinux_dir@@'
syslinux_memdisk_folder: '@@memdisk_folder@@'
syslinux_pxelinux_folder: '@@pxelinux_folder@@'
grub2_mod_dir: '@@grub_mod_folder@@'
bootloaders_shim_folder: '@@shim_folder@@'
bootloaders_shim_file: '@@shim_file@@'
bootloaders_ipxe_folder: '@@ipxe_folder@@'
syslinux_dir: {{ cobbler['bootloders']['syslinux']['location']|yaml_encode }}
syslinux_memdisk_folder: {{ cobbler['bootloders']['syslinux']['memdisk_location']|yaml_encode }}
syslinux_pxelinux_folder: {{ cobbler['bootloders']['syslinux']['pxelinux_location']|yaml_encode }}
grub2_mod_dir: {{ cobbler['bootloders']['grub2']['mod_location']|yaml_encode }}
bootloaders_shim_folder: {{ cobbler['bootloders']['shim']['location']|yaml_encode }}
bootloaders_shim_file: {{ cobbler['bootloders']['shim']['file']|yaml_encode }}
bootloaders_ipxe_folder: {{ cobbler['bootloders']['ipxe']['location']|yaml_encode }}
build_reporting_enabled: false
build_reporting_sender: ""
build_reporting_email: [ 'root@localhost' ]
Expand All @@ -125,7 +125,7 @@ default_virt_bridge: xenbr0
default_virt_file_size: 5.0
default_virt_ram: 512
default_virt_type: xenpv
enable_ipxe: {{ cobbler['ipxe']['enabled']|yaml_encode }}
enable_ipxe: {{ cobbler['bootloders']['ipxe']['enabled']|yaml_encode }}
enable_menu: {{ cobbler['menu']['enabled']|yaml_encode }}
http_port: 80
kernel_options: {}
Expand Down Expand Up @@ -160,12 +160,12 @@ next_server_v4: {{ cobbler['nextserver']['v4']|yaml_dquote }}
next_server_v6: {{ cobbler['nextserver']['v6']|yaml_dquote }}
manage_dns: {{ cobbler['dns']['enabled']|yaml_encode }}
bind_chroot_path: ""
bind_zonefile_path: "@@bind_zonefiles@@"
bind_zonefile_path: {{ cobbler['dns']['bind']['location']|yaml_encode }}
bind_master: {{ cobbler['dns']['bind']['master']|yaml_encode }}
manage_forward_zones: []
manage_reverse_zones: []
manage_tftpd: {{ cobbler['tftp']['enabled']|yaml_encode }}
tftpboot_location: "@@tftproot@@"
tftpboot_location: {{ cobbler['tftp']['location']|yaml_encode }}
manage_rsync: {{ cobbler['rsync']['enabled']|yaml_encode }}
power_management_default_type: {{ cobbler['power_management']['default_type']|yaml_dquote }}
pxe_just_once: true
Expand All @@ -187,7 +187,7 @@ server: {{ cobbler['server'] }}
client_use_localhost: false
client_use_https: false
virt_auto_boot: true
webdir: "@@webroot@@/cobbler"
webdir: "{{ cobbler['webdir'] }}/cobbler"
webdir_whitelist:
- misc
- web
Expand Down
17 changes: 15 additions & 2 deletions cobbler/parameters/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,19 @@ values:
authorization:
module: "allowall"
default_ownership: "admin"
ipxe:
enabled: false
bootloaders:
syslinux:
location: ""
memdisk_location: ""
pxelinux_location: ""
grub2:
mod_location: ""
shim:
location: ""
file: ""
ipxe:
enabled: false
location: /usr/share/ipxe/
dhcp:
v4: false
v6: false
Expand All @@ -41,6 +52,7 @@ values:
enabled: false
module: "bind"
bind:
location: /var/lib/named
master: "127.0.0.1"
forward_zones: []
reverse_zones: []
Expand All @@ -61,3 +73,4 @@ values:
author: "cobbler <cobbler@localhost>"
push_script: "/bin/true"
config: /etc/cobbler/settings.yaml
webdir: /var/www
5 changes: 5 additions & 0 deletions cobbler/parameters/os/Ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
# values: {}
---
values:
dns:
bind:
location: /etc/bind/db.
ipxe:
location: /usr/lib/ipxe/
tftp:
location: /var/lib/tftpboot
...
3 changes: 3 additions & 0 deletions cobbler/parameters/os_family/RedHat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
# values: {}
---
values:
dns:
bind:
location: /var/named
pkg:
epel:
enabled: true
Expand Down
3 changes: 2 additions & 1 deletion cobbler/parameters/os_family/Suse.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@
# you can remove this file or provide at least an empty dict, e.g.
# values: {}
---
values: {}
values:
webdir: /srv/www
...

0 comments on commit ec2377a

Please sign in to comment.