diff options
Diffstat (limited to 'roles/host/templates')
| -rw-r--r-- | roles/host/templates/etc_rc.conf.j2 | 8 | ||||
| -rw-r--r-- | roles/host/templates/usr_local_bin_update_ports.sh.j2 | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/roles/host/templates/etc_rc.conf.j2 b/roles/host/templates/etc_rc.conf.j2 index 985ec41..2fa289d 100644 --- a/roles/host/templates/etc_rc.conf.j2 +++ b/roles/host/templates/etc_rc.conf.j2 @@ -19,6 +19,7 @@ ifconfig_lan0_ipv6="inet6 accept_rtadv" ifconfig_wan0="up" ifconfig_brlan0="addm lan0 up" ifconfig_brwan0="addm wan0 up" +kld_list="pf if_wg fdescfs linux64" {% else %} ifconfig_bridge0_name="brlan0" ifconfig_bridge1_name="brwan0" @@ -26,6 +27,7 @@ ifconfig_vtnet0="inet {{ lan_ipv4_cidr }}" ifconfig_vtnet0_ipv6="inet6 accept_rtadv" ifconfig_brlan0="addm vtnet0 up" ifconfig_brwan0="up" +kld_list="pf if_wg linux64" {% endif %} zpool_gpt_labels_enable="YES" smartd_enable="YES" @@ -40,8 +42,4 @@ clear_tmp_enable="YES" cleanvar_enable="YES" auditd_enable="YES" devd_enable="YES" -{% if is_prod %} -kld_list="pf if_wg fdescfs linux64" -{% else %} -kld_list="pf if_wg linux64" -{% endif %} +netdata_enable="YES" diff --git a/roles/host/templates/usr_local_bin_update_ports.sh.j2 b/roles/host/templates/usr_local_bin_update_ports.sh.j2 index 1a512af..7f6522e 100644 --- a/roles/host/templates/usr_local_bin_update_ports.sh.j2 +++ b/roles/host/templates/usr_local_bin_update_ports.sh.j2 @@ -10,7 +10,7 @@ usage() { BASEDIR=/usr/ports REMOTE_QUARTERLY="https://github.com/freebsd/freebsd-ports.git" -REMOTE_CUSTOM="https://github.com/jantuomi/freebsd-ports-custom.git" +REMOTE_CUSTOM="http://{{ jail_ips.forge }}/freebsd-ports-custom.git" case "$1" in quarterly) @@ -46,6 +46,7 @@ custom) # Clone or update if [ -d "${BASEDIR}/custom/.git" ]; then echo "Updating custom ports overlay..." + git -C "${BASEDIR}/custom" remote set-url origin "$REMOTE_CUSTOM" git -C "${BASEDIR}/custom" fetch origin git -C "${BASEDIR}/custom" reset --hard origin/main else |