Skip to content

Commit

Permalink
From: Thomas Hiller <thomas.hiller@hpe.com>
Browse files Browse the repository at this point in the history
Make tftpboot directory dynamic and replace settings via setup.py

cobbler#2347
  • Loading branch information
watologo1 committed Jun 8, 2020
1 parent cef6cfd commit 06061a7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions config/apache/cobbler.conf
Expand Up @@ -6,8 +6,8 @@ AliasMatch ^/cobbler_track(.*)?$ "@@webroot@@/cobbler$1"
#AliasMatch ^/cobbler(.*)?$ "@@webroot@@/cobbler$1"
Alias /cobbler @@webroot@@/cobbler

Alias /httpboot /srv/tftpboot/grub
Alias /images /srv/tftpboot/grub/images
Alias /httpboot @@tftproot@@/grub
Alias /images @@tftproot@@/grub/images

WSGIScriptAliasMatch ^/cblr/svc/([^/]*) @@webroot@@/cobbler/svc/services.py

Expand All @@ -19,7 +19,7 @@ WSGIScriptAliasMatch ^/cblr/svc/([^/]*) @@webroot@@/cobbler/svc/services.py
Require all granted
</Directory>

<Directory /srv/tftpboot/grub>
<Directory @@tftproot@@/grub>
Options Indexes FollowSymLinks
AllowOverride None
AuthType None
Expand Down
4 changes: 2 additions & 2 deletions config/cobbler/settings
Expand Up @@ -246,8 +246,8 @@ manage_tftpd: 1

# This variable contains the location of the tftpboot directory. If this directory is not present cobbler does not
# start.
# Default: /var/lib/tftpboot
tftpboot_location: "/var/lib/tftpboot"
# Default: @@tftproot@@
tftpboot_location: "@@tftproot@@"

# set to 1 to enable Cobbler's RSYNC management features.
manage_rsync: 0
Expand Down

0 comments on commit 06061a7

Please sign in to comment.