This commit is contained in:
Jonas Forsberg 2021-10-14 18:00:49 +02:00
parent 2377428836
commit 8a2650de59
4 changed files with 36 additions and 2 deletions

View File

@ -9,6 +9,7 @@ base:
- ssh - ssh
- wireguard - wireguard
- hostapd - hostapd
- pxe
{% if salt['pillar.file_exists']('local.sls') %} {% if salt['pillar.file_exists']('local.sls') %}
- local - local
{% endif %} {% endif %}

View File

@ -4,13 +4,19 @@ set timeout=60
# Default boot entry # Default boot entry
set default=boot-bios set default=boot-bios
# Menu Colours # Visual
GRUB_GFXMODE=1024x768x32
GRUB_GFXPAYLOAD_LINUX=keep
## Menu Colours
set menu_color_normal=white/black set menu_color_normal=white/black
set menu_color_highlight=white/green set menu_color_highlight=white/green
menuentry 'Continue to normal BIOS boot' --id boot-bios --class exit { menuentry 'Continue to normal BIOS boot' --id boot-bios --class exit {
exit exit
} }
submenu "Harvester ->" {
configfile harvester.cfg
}
submenu "openSUSE ->" { submenu "openSUSE ->" {

View File

@ -30,6 +30,7 @@ Add files to tftpboot:
- name: /srv/tftpboot - name: /srv/tftpboot
- source: salt://atftp/files - source: salt://atftp/files
- include_empty: True - include_empty: True
- replace: False
Start the atftpd.socket: Start the atftpd.socket:
service.running: service.running:

View File

@ -40,3 +40,29 @@ Stopp {{ service }}:
- enable: False - enable: False
{% endfor %} {% endfor %}
Remove rmt http as default site:
file.replace:
- name: /etc/nginx/vhosts.d/rmt-server-http.conf
- pattern: " listen 80 default;"
- repl: " listen 80;"
Set fqdn for rmt https:
file.replace:
- name: /etc/nginx/vhosts.d/rmt-server-https.conf
- pattern: " server_name rmt;"
- repl: " server_name rmt.{{ pillar['network']['domain'] }};"
Set fqdn for rmt http:
file.replace:
- name: /etc/nginx/vhosts.d/rmt-server-http.conf
- pattern: " server_name rmt;"
- repl: " server_name rmt.{{ pillar['network']['domain'] }};"
Restart nginx:
service.running:
- name: nginx
- enable: Trie
- watch:
- file: Remove rmt http as default site
- file: Set fqdn for rmt https
- file: Set fqdn for rmt http