Compare commits

...

6 Commits

Author SHA1 Message Date
13253824c6 rework routers 2025-03-20 22:35:49 +01:00
26ffee17be names and places 2025-03-20 22:29:28 +01:00
f60153aca6 expand network db 2025-03-20 22:20:14 +01:00
7d66d5c55e basic network db 2025-03-20 22:05:41 +01:00
e44620521f remove old showpass script
The dmzadmin repo now populates password lists, no need for this.
2025-03-20 18:58:48 +01:00
49c1417b8a make soft man pages 2024-12-06 22:39:45 +01:00
5 changed files with 105 additions and 64 deletions

View File

@@ -29,6 +29,12 @@ krovmans = $(krov_docs:krov/%/README.md=$(mandir)/%.6)
$(mandir)/%.6: krov/%/README.md
lowdown -stman $< > $@
splint_docs != grep -rl "^section:" splintrs
splintmans = $(splint_docs:splintrs/%/README.md=$(mandir)/%.6)
$(mandir)/%.6: splintrs/%/README.md
lowdown -stman $< > $@
setup_docs != grep -rl "^section:" setup
setupmans = $(setup_docs:setup/%.md=$(mandir)/%.6)
@@ -38,10 +44,10 @@ $(mandir)/%.6: setup/%.md
$(mandir):
mkdir -p $@
$(kralmans) $(krovmans) $(setupmans) :| $(mandir)
$(kralmans) $(krovmans) $(splintmans) $(setupmans) :| $(mandir)
.PHONY: pages
pages: $(kralmans) $(krovmans) $(setupmans)
pages: $(kralmans) $(krovmans) $(setupmans) $(splintmans)
$(info $(kralmans))
@test ! $(command -v mandb) || mandb --user-db
$(info Open DMZ's man pages with 'man 6 <tab>')

85
network.rec Normal file
View File

@@ -0,0 +1,85 @@
%rec: router
name: ISP Router
location: kralizec
ISP: Orion
name: ISP Router
location: krov
ISP: Yettel
%rec: host
%doc: These are the real machines, most of which virtualize.
%type: host rec lxc
name: Moxx
name: Serverko
location: krov
%rec: lxc
%doc: A container, usually on a Proxmox host
name: nginx-11
gateway: ISP-router
host: Mox
proxies: wiki-11
proxies: gitea-11
proxies: forum-11
proxies: ejabberd-11
proxies: dmzrs
name: LDAP
host: Moxx
name: website
host: Moxx
authqueries: LDAP
queries: postgresql-11
service: dmzrs
service: flask accounts
name: gitea-11
service: gitea
host: Moxx
authqueries: LDAP
queries: postgresql-11
name: ejabberd-11
service: ejabberd
host: Moxx
authqueries: LDAP
queries: postgresql-11
name: forum-11
service: forum
host: Moxx
authqueries: LDAP
queries: postgresql-11
name: postfix-11
service: postfix
authqueries: LDAP
name: tor-11
service: tor
host: Moxx
name: postgresql-11
service: postgresql
host: Moxx
name: wiki-11
service: wiki
host: Moxx
authqueries: LDAP
name: nginx-12
host: Serverko
name: nextcloud
host: Serverko
name: tor-12
host: nginx

View File

@@ -1,62 +0,0 @@
#!/bin/sh
# If you want to add these passwords to the `pass` program, you can
# symlink all the passwords which you can open, then open the
# passwords with a script like this.
pass_store=~/.password-store
# THIS_PLACE="$PWD"
# mkdir $pass_store/dmz
# cd !$
# find "$THIS_PLACE" -type f -name "*.gpg" | \
# sed "s#/home/ghost#../..#" | \
# while read -r line; do
# gpg -d "$line" && ln -sf "$line" .
# done
sanity_check(){
command -v $1 >/dev/null || (
echo "You must install $1"
exit 1
)
}
set_selector_if_program_exists(){
command -v "$1" > /dev/null && selector="$1 $2"
}
if [ -z "$DISPLAY" ]; then
set_selector_if_program_exists sk || \
set_selector_if_program_exists fzy || \
set_selector_if_program_exists fzf
fail_sender='echo'
else
set_selector_if_program_exists "rofi" 'rofi -dmenu "$@"' || \
set_selector_if_program_exists dmenu || \
(
echo "Cannot find anything to select a key. Install dmenu."
exit 1
)
fail_sender='notify-send'
fi
list_keys(){
find -L . -mindepth 1 -type f -name "*.gpg" | \
sed 's/\.\///' | \
sed 's/.gpg//'
}
####################
set -e
sanity_check pass
cd "$pass_store"
password="$(list_keys | $selector)"
pass -c "$password" || $fail_sender 'Cannot decrypt'

View File

@@ -1,3 +1,9 @@
---
source: Decentrala
section: 6
title: Soft-Serve Basics
---
Soft Serve has its configurations stored inside itself in a repo. Admins can pull:
`git clone ssh://soft.dmz.rs:2222/.soft-serve`

View File

@@ -1,3 +1,9 @@
---
source: Decentrala
section: 6
title: Soft-Serve Webhooks
---
### Soft serve webhooks
Soft serve supports [webhooks](https://en.wikipedia.org/wiki/Webhook)