Latest
This commit is contained in:
parent
9cdc8aa05a
commit
38ef97b8f7
7 changed files with 14 additions and 16 deletions
|
@ -148,11 +148,6 @@ elif command -v warp-cli > /dev/null; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if command -v git > /dev/null; then
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
if command -v warp-cli > /dev/null; then
|
if command -v warp-cli > /dev/null; then
|
||||||
### Application certificate configuration
|
### Application certificate configuration
|
||||||
|
|
||||||
|
|
|
@ -22,10 +22,8 @@ if [ -d /Applications ] && [ -d /System ]; then
|
||||||
# Source: https://apple.stackexchange.com/questions/30238/how-to-enable-os-x-screen-sharing-vnc-through-ssh
|
# Source: https://apple.stackexchange.com/questions/30238/how-to-enable-os-x-screen-sharing-vnc-through-ssh
|
||||||
# To disable, run: sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -deactivate -configure -access -off
|
# To disable, run: sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -deactivate -configure -access -off
|
||||||
# Only enable when computer is not a corporate / work computer
|
# Only enable when computer is not a corporate / work computer
|
||||||
{{ if (ne .host.work true) -}}
|
|
||||||
logg info 'Enabling VNC using the `VNC_PASSWORD` variable which is `vncpass` when nothing is specified'
|
logg info 'Enabling VNC using the `VNC_PASSWORD` variable which is `vncpass` when nothing is specified'
|
||||||
sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -allowAccessFor -specifiedUsers -clientopts -setreqperm -reqperm yes -setvnclegacy -vnclegacy yes -setvncpw -vncpw {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "VNC_PASSWORD")) }}{{ includeTemplate "secrets/VNC_PASSWORD" | decrypt | trim }}{{ else }}{{ default "vncpass" (env "VNC_PASSWORD") }}{{ end }} -restart -agent -privs -all -users {{ .user.name }}
|
sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -allowAccessFor -specifiedUsers -clientopts -setreqperm -reqperm yes -setvnclegacy -vnclegacy yes -setvncpw -vncpw {{- if and (stat (joinPath .host.home ".config" "age" "chezmoi.txt")) (stat (joinPath .chezmoi.sourceDir ".chezmoitemplates" "secrets" "VNC_PASSWORD")) }}{{ includeTemplate "secrets/VNC_PASSWORD" | decrypt | trim }}{{ else }}{{ default "vncpass" (env "VNC_PASSWORD") }}{{ end }} -restart -agent -privs -all -users {{ .user.name }}
|
||||||
{{- end }}
|
|
||||||
else
|
else
|
||||||
# System is Linux
|
# System is Linux
|
||||||
### VNC set-up / configuration
|
### VNC set-up / configuration
|
||||||
|
|
|
@ -34,6 +34,9 @@ if command -v privoxy > /dev/null; then
|
||||||
if [ -d "$PRIVOXY_CONFIG_DIR" ]; then
|
if [ -d "$PRIVOXY_CONFIG_DIR" ]; then
|
||||||
sudo cp -f "${XDG_CONFIG_HOME:-HOME/.config}/privoxy/config" "$PRIVOXY_CONFIG"
|
sudo cp -f "${XDG_CONFIG_HOME:-HOME/.config}/privoxy/config" "$PRIVOXY_CONFIG"
|
||||||
sudo chmod 600 "$PRIVOXY_CONFIG"
|
sudo chmod 600 "$PRIVOXY_CONFIG"
|
||||||
|
if command -v add-user > /dev/null; then
|
||||||
|
sudo add-user privoxy
|
||||||
|
fi
|
||||||
sudo chown privoxy:privoxy "$PRIVOXY_CONFIG"
|
sudo chown privoxy:privoxy "$PRIVOXY_CONFIG"
|
||||||
|
|
||||||
# @description Restart Privoxy after configuration is applied
|
# @description Restart Privoxy after configuration is applied
|
||||||
|
|
|
@ -78,7 +78,7 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
|
||||||
logg info "Processing Firefox profile location $SETTINGS_DIR"
|
logg info "Processing Firefox profile location $SETTINGS_DIR"
|
||||||
unset FIREFOX_EXE
|
unset FIREFOX_EXE
|
||||||
if [ "$SETTINGS_DIR" == "$HOME/.var/app/org.mozilla.firefox" ]; then
|
if [ "$SETTINGS_DIR" == "$HOME/.var/app/org.mozilla.firefox" ]; then
|
||||||
if ! command -v org.mozilla.firefox > /dev/null; then
|
if ! command -v org.mozilla.firefox > /dev/null || [ ! -d "$HOME/.var/app/org.mozilla.firefox" ]; then
|
||||||
continue
|
continue
|
||||||
else
|
else
|
||||||
FIREFOX_EXE="$(which org.mozilla.firefox)"
|
FIREFOX_EXE="$(which org.mozilla.firefox)"
|
||||||
|
@ -106,14 +106,14 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
elif [ "$SETTINGS_DIR" == "$HOME/.var/app/io.gitlab.librewolf-community/.librewolf" ]; then
|
elif [ "$SETTINGS_DIR" == "$HOME/.var/app/io.gitlab.librewolf-community/.librewolf" ]; then
|
||||||
if ! command -v io.gitlab.librewolf-community > /dev/null; then
|
if ! command -v io.gitlab.librewolf-community > /dev/null || [ ! -d "$HOME/.var/app/io.gitlab.librewolf-community" ]; then
|
||||||
continue
|
continue
|
||||||
else
|
else
|
||||||
FIREFOX_EXE="$(which io.gitlab.librewolf-community)"
|
FIREFOX_EXE="$(which io.gitlab.librewolf-community)"
|
||||||
fi
|
fi
|
||||||
elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/Firefox/Profiles" ]; then
|
elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/Firefox/Profiles" ]; then
|
||||||
FIREFOX_EXE="/Applications/Firefox.app/Contents/MacOS/firefox"
|
FIREFOX_EXE="/Applications/Firefox.app/Contents/MacOS/firefox"
|
||||||
if [ ! -f "$FIREFOX_EXE" ]; then
|
if [ ! -f "$FIREFOX_EXE" ] || [ ! -d /Applications ]; then
|
||||||
continue
|
continue
|
||||||
else
|
else
|
||||||
### Download Firefox Profile Switcher
|
### Download Firefox Profile Switcher
|
||||||
|
@ -131,12 +131,12 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
|
||||||
fi
|
fi
|
||||||
elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/LibreWolf/Profiles" ]; then
|
elif [ "$SETTINGS_DIR" == "$HOME/Library/Application Support/LibreWolf/Profiles" ]; then
|
||||||
FIREFOX_EXE="/Applications/LibreWolf.app/Contents/MacOS/librewolf"
|
FIREFOX_EXE="/Applications/LibreWolf.app/Contents/MacOS/librewolf"
|
||||||
if [ ! -f "$FIREFOX_EXE" ]; then
|
if [ ! -f "$FIREFOX_EXE" ] || [ ! -d /Applications ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
elif [ "$SETTINGS_DIR" == "$HOME/snap/firefox/common/.mozilla/firefox" ]; then
|
elif [ "$SETTINGS_DIR" == "$HOME/snap/firefox/common/.mozilla/firefox" ]; then
|
||||||
FIREFOX_EXE="/snap/bin/firefox"
|
FIREFOX_EXE="/snap/bin/firefox"
|
||||||
if [ ! -f "$FIREFOX_EXE" ]; then
|
if [ ! -f "$FIREFOX_EXE" ] || [ ! -d "$HOME/snap/firefox" ]; then
|
||||||
continue
|
continue
|
||||||
else
|
else
|
||||||
### Firefox Profile Switcher
|
### Firefox Profile Switcher
|
||||||
|
@ -243,8 +243,7 @@ for SETTINGS_DIR in "$HOME/snap/firefox/common/.mozilla/firefox" "$HOME/.var/app
|
||||||
git pull origin master
|
git pull origin master
|
||||||
else
|
else
|
||||||
logg info 'Cloning the public Firefox git profile'
|
logg info 'Cloning the public Firefox git profile'
|
||||||
cd "$SETTINGS_DIR"
|
cd "$SETTINGS_DIR" && git clone {{ .firefoxPublicProfile }} profile.git
|
||||||
git clone {{ .firefoxPublicProfile }} profile.git
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
### Copy user.js to profile.git profile
|
### Copy user.js to profile.git profile
|
||||||
|
|
|
@ -8,6 +8,6 @@
|
||||||
{{ includeTemplate "universal/profile" }}
|
{{ includeTemplate "universal/profile" }}
|
||||||
{{ includeTemplate "universal/logg" }}
|
{{ includeTemplate "universal/logg" }}
|
||||||
|
|
||||||
logg info 'Coming soon..'
|
logg info 'Kasm Workspaces coming soon..'
|
||||||
|
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
|
|
4
home/dot_config/cloudflared/config.yaml
Normal file
4
home/dot_config/cloudflared/config.yaml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
tunnel: The tunnel UUID
|
||||||
|
credentials-file: /path/your-tunnels-credentials-file.json
|
||||||
|
warp-routing:
|
||||||
|
enabled: true
|
|
@ -7215,7 +7215,6 @@ softwarePackages:
|
||||||
_name: FirewallD
|
_name: FirewallD
|
||||||
_service: firewalld
|
_service: firewalld
|
||||||
_pre: if command -v ufw > /dev/null; then sudo ufw disable; fi
|
_pre: if command -v ufw > /dev/null; then sudo ufw disable; fi
|
||||||
_service: firewalld
|
|
||||||
_notes: https://computingforgeeks.com/install-and-use-firewalld-on-ubuntu/
|
_notes: https://computingforgeeks.com/install-and-use-firewalld-on-ubuntu/
|
||||||
apt: firewalld
|
apt: firewalld
|
||||||
dnf: firewalld
|
dnf: firewalld
|
||||||
|
|
Loading…
Reference in a new issue