Sync with master.

This commit is contained in:
Darren 'Tadgy' Austin 2023-10-12 21:44:39 +01:00
commit 6ce308d16b
2 changed files with 31 additions and 25 deletions

View file

@ -18,6 +18,7 @@
autoSetupRemote = true autoSetupRemote = true
[alias] [alias]
c = commit c = commit
co = checkout
d = diff d = diff
p = push p = push
s = status s = status
@ -28,8 +29,13 @@
directory = /data/tmp/slackbuilds.git directory = /data/tmp/slackbuilds.git
directory = /data/tmp/ponce-slackbuilds.git directory = /data/tmp/ponce-slackbuilds.git
[maintenance] [maintenance]
repo = / repo = /home/tadgy
repo = /root repo = /data/home/tadgy/Projects/bash-ini-parser.git
repo = /etc/slackpkg/templates repo = /data/home/tadgy/Projects/bash-tasksched.git
repo = /data/home/tadgy/Projects/bootstrap.git
repo = /data/home/tadgy/Projects/dotfiles.git
repo = /data/home/tadgy/Projects/lumberjack.git
repo = /data/home/tadgy/Projects/slackpkg-templates.git
repo = /data/home/tadgy/Projects/system-configs.git
[init] [init]
defaultBranch = master defaultBranch = master

View file

@ -14,28 +14,6 @@ StrictHostKeyChecking accept-new
VerifyHostKeyDNS yes VerifyHostKeyDNS yes
VisualHostKey yes VisualHostKey yes
# Temp.
Host zapp zapp.opensourcerers.net
Hostname zapp.opensourcerers.net
Port 9922
# Remote servers.
Host amy amy.hosts.slackware.network bender bender.hosts.slackware.network fry fry.hosts.slackware.network leela leela.hosts.slackware.network mirror mirror.hosts.slackware.network seedbox seedbox.hosts.slackware.network
CanonicalDomains hosts.slackware.network
CanonicalizeHostname yes
Port 9922
Host as.hosts.slackware.network
Port 9922
User root
ForwardAgent no
ClearAllForwardings yes
Host esx0.hosts.slackware.network esx1.hosts.slackware.network
User root
ForwardAgent no
ClearAllForwardings yes
# Home stuff. # Home stuff.
Host afterdark.org.uk Host afterdark.org.uk
Port 6722 Port 6722
@ -65,7 +43,29 @@ Host clone-* full-*
User root User root
ClearAllForwardings yes ClearAllForwardings yes
# Remote servers.
Host amy amy.hosts.slackware.network bender bender.hosts.slackware.network fry fry.hosts.slackware.network leela leela.hosts.slackware.network mirror mirror.hosts.slackware.network seedbox seedbox.hosts.slackware.network
CanonicalDomains hosts.slackware.network
CanonicalizeHostname yes
Port 9922
Host as.hosts.slackware.network
Port 9922
User root
ForwardAgent no
ClearAllForwardings yes
Host esx0.hosts.slackware.network esx1.hosts.slackware.network
User root
ForwardAgent no
ClearAllForwardings yes
# Git services. # Git services.
Host github.com git.rlworkman.net Host github.com git.rlworkman.net
User git User git
ClearAllForwardings yes ClearAllForwardings yes
# Temp.
Host zapp zapp.opensourcerers.net
Hostname zapp.opensourcerers.net
Port 9922