diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index 6be197c..322d499 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -9,6 +9,7 @@ pf_config: "odofreebsd_pf.conf" pflog_conf: - name: 0 dev: pflog0 +prefer_ipv6: true dummynet_config: "dnctl.conf" network_rc: "odofreebsd_network.conf" rc_conf: "odofreebsd_rc.conf" @@ -41,6 +42,7 @@ users: devfs_rules: "odo_devfs.rules" jail_zfs_dataset: zroot/freebsd/current/jails jail_zfs_dataset_mountpoint: /jail +jail_canmount: "on" jail_list: - name: nat_dhcp enabled: true diff --git a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash index b95e55a..c1bb261 100644 --- a/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash +++ b/ansible/roles/bhyve/files/bhyve_netgraph_bridge.bash @@ -105,7 +105,8 @@ function start_vm { local bridge_name="$BRIDGE_NAME" local ip_range="$IP_RANGE" # for raw this value does not matter - local mac_address=$(calculate_mac_address "$name") + local mac_address + mac_address=$(calculate_mac_address "$name") local additional_args=() @@ -245,7 +246,8 @@ function ng_exists { function calculate_mac_address { local name="$1" - local source=$(md5 -r -s "$name" | awk '{print $1}') + local source + source=$(md5 -r -s "$name" | awk '{print $1}') echo "06:${source:0:2}:${source:2:2}:${source:4:2}:${source:6:2}:${source:8:2}" } diff --git a/ansible/roles/firefox/defaults/main.yaml b/ansible/roles/firefox/defaults/main.yaml index fca1a5d..a928558 100644 --- a/ansible/roles/firefox/defaults/main.yaml +++ b/ansible/roles/firefox/defaults/main.yaml @@ -13,3 +13,11 @@ firefox_config: browser.newtabpage.activity-stream.feeds.section.topstories: false browser.newtabpage.pinned: "[]" browser.newtabpage.activity-stream.section.highlights.includePocket: false + # Disable cache when devtools are open. + devtools.cache.disabled: true + # Do not track header. + privacy.donottrackheader.enabled: true + # Tell websites not to share or sell my data. + privacy.globalprivacycontrol.enabled: true + # Disable "studies" (slice testing) + app.shield.optoutstudies.enabled: false diff --git a/ansible/roles/jail/files/jail_netgraph_bridge.bash b/ansible/roles/jail/files/jail_netgraph_bridge.bash index 70b9992..68348ee 100644 --- a/ansible/roles/jail/files/jail_netgraph_bridge.bash +++ b/ansible/roles/jail/files/jail_netgraph_bridge.bash @@ -23,11 +23,15 @@ function start_jail { jail_interface_name=$(sanitize_interface_name "$2") ip_range="$3" + local mac_address + mac_address=$(calculate_mac_address "$jail_interface_name") + assert_bridge "$host_interface_name" "$bridge_name" "$ip_range" bridge_link_name=$(detect_available_link "${bridge_name}") ngctl -d -f - <