Compare commits
1 Commits
76e9650abe
...
man
Author | SHA1 | Date | |
---|---|---|---|
30c0774d62
|
10
Makefile
10
Makefile
@@ -29,12 +29,6 @@ krovmans = $(krov_docs:krov/%/README.md=$(mandir)/%.6)
|
|||||||
$(mandir)/%.6: krov/%/README.md
|
$(mandir)/%.6: krov/%/README.md
|
||||||
lowdown -stman $< > $@
|
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
|
setup_docs != grep -rl "^section:" setup
|
||||||
setupmans = $(setup_docs:setup/%.md=$(mandir)/%.6)
|
setupmans = $(setup_docs:setup/%.md=$(mandir)/%.6)
|
||||||
|
|
||||||
@@ -44,10 +38,10 @@ $(mandir)/%.6: setup/%.md
|
|||||||
$(mandir):
|
$(mandir):
|
||||||
mkdir -p $@
|
mkdir -p $@
|
||||||
|
|
||||||
$(kralmans) $(krovmans) $(splintmans) $(setupmans) :| $(mandir)
|
$(kralmans) $(krovmans) $(setupmans) :| $(mandir)
|
||||||
|
|
||||||
.PHONY: pages
|
.PHONY: pages
|
||||||
pages: $(kralmans) $(krovmans) $(setupmans) $(splintmans)
|
pages: $(kralmans) $(krovmans) $(setupmans)
|
||||||
$(info $(kralmans))
|
$(info $(kralmans))
|
||||||
@test ! $(command -v mandb) || mandb --user-db
|
@test ! $(command -v mandb) || mandb --user-db
|
||||||
$(info Open DMZ's man pages with 'man 6 <tab>')
|
$(info Open DMZ's man pages with 'man 6 <tab>')
|
||||||
|
18
kn.mk
Normal file
18
kn.mk
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
all_docs != find krov/serverko -name README.md
|
||||||
|
|
||||||
|
path_to_docs = $(patsubst krov/%/README.md, docs/%.md, $(all_docs))
|
||||||
|
|
||||||
|
stripped_docs = $(notdir $(path_to_docs))
|
||||||
|
|
||||||
|
x:
|
||||||
|
$(info $(all_docs))
|
||||||
|
$(info $(stripped_docs))
|
||||||
|
|
||||||
|
docs/kralizec/%.md: kralizec/%/README.md
|
||||||
|
mkdir -p $(@D)
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
|
docs/serverko/%.md: krov/serverko/%/README.md
|
||||||
|
mkdir -p $(@D)
|
||||||
|
cp $< $@
|
||||||
|
|
@@ -1,5 +1,3 @@
|
|||||||
---
|
---
|
||||||
VMID: 114
|
VMID: 114
|
||||||
---
|
---
|
||||||
|
|
||||||
[wiki page](https://wiki.dmz.rs/en/sysadmin/ssh)
|
|
||||||
|
@@ -1,58 +0,0 @@
|
|||||||
---
|
|
||||||
VMID: 103
|
|
||||||
---
|
|
||||||
|
|
||||||
[Wireguard VPN quickstart](https://www.wireguard.com/quickstart)
|
|
||||||
|
|
||||||
Check dmzadmin for `wireguard.gpg` to know who to contact for access
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Server config
|
|
||||||
|
|
||||||
New user/client needs to provide their wireguard `publickey` and new ip on the network needs to be assigned (`x`)
|
|
||||||
add next lines to the bottom of the conf file - `/etc/wireguard/wg0.conf`
|
|
||||||
|
|
||||||
```conf
|
|
||||||
[Peer]
|
|
||||||
PublicKey = <client_public_key>
|
|
||||||
AllowedIPs = 192.168.164.x/32
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### Client config
|
|
||||||
|
|
||||||
client conf example
|
|
||||||
`x` is the assinged on the server as peer
|
|
||||||
|
|
||||||
```conf
|
|
||||||
|
|
||||||
[Interface]
|
|
||||||
Address = 192.168.164.x/32
|
|
||||||
DNS = 1.1.1.1
|
|
||||||
MTU = 1420
|
|
||||||
SaveConfig = true
|
|
||||||
ListenPort = 51820
|
|
||||||
FwMark = 0xca6c
|
|
||||||
PrivateKey = <your_private_wg_key>
|
|
||||||
|
|
||||||
[Peer]
|
|
||||||
PublicKey = JP2FTHLUujkevz1kUymciLImsx1OX9ViUko7oPAIoiA=
|
|
||||||
AllowedIPs = 192.168.164.0/24, 192.168.1.0/24
|
|
||||||
Endpoint = 77.105.27.232:51820
|
|
||||||
PersistentKeepalive = 21
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Command to resolve ip clashing with current and wireguard network
|
|
||||||
|
|
||||||
```shell
|
|
||||||
ip route add <ip> dev <wg0>
|
|
||||||
```
|
|
||||||
|
|
||||||
- `ip` you want to resove -> for wireguard vm 192.168.1.10
|
|
||||||
- `wg0` name of the wireguard conf
|
|
||||||
|
|
@@ -1,5 +0,0 @@
|
|||||||
---
|
|
||||||
VMID: 100
|
|
||||||
---
|
|
||||||
|
|
||||||
[wiki page](https://wiki.dmz.rs/en/sysadmin/ssh)
|
|
@@ -1,5 +0,0 @@
|
|||||||
|
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
echo $(shuf shared/english.txt | head) | sed "s/ //g"
|
|
||||||
|
|
62
scripts/showpass.sh
Executable file
62
scripts/showpass.sh
Executable file
@@ -0,0 +1,62 @@
|
|||||||
|
#!/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'
|
||||||
|
|
@@ -56,6 +56,7 @@ Now all the files have 'read, write, and execute', but only for `$USER`.
|
|||||||
Host soft
|
Host soft
|
||||||
HostName soft.dmz.rs
|
HostName soft.dmz.rs
|
||||||
Port 2222
|
Port 2222
|
||||||
|
User ghost
|
||||||
IdentityFile ~/.ssh/id rsa
|
IdentityFile ~/.ssh/id rsa
|
||||||
Host dmz
|
Host dmz
|
||||||
HostName dmz.rs
|
HostName dmz.rs
|
||||||
|
@@ -1,9 +1,3 @@
|
|||||||
---
|
|
||||||
source: Decentrala
|
|
||||||
section: 6
|
|
||||||
title: Soft-Serve Basics
|
|
||||||
---
|
|
||||||
|
|
||||||
Soft Serve has its configurations stored inside itself in a repo. Admins can pull:
|
Soft Serve has its configurations stored inside itself in a repo. Admins can pull:
|
||||||
|
|
||||||
`git clone ssh://soft.dmz.rs:2222/.soft-serve`
|
`git clone ssh://soft.dmz.rs:2222/.soft-serve`
|
||||||
|
@@ -1,9 +1,3 @@
|
|||||||
---
|
|
||||||
source: Decentrala
|
|
||||||
section: 6
|
|
||||||
title: Soft-Serve Webhooks
|
|
||||||
---
|
|
||||||
|
|
||||||
### Soft serve webhooks
|
### Soft serve webhooks
|
||||||
|
|
||||||
Soft serve supports [webhooks](https://en.wikipedia.org/wiki/Webhook)
|
Soft serve supports [webhooks](https://en.wikipedia.org/wiki/Webhook)
|
||||||
|
Reference in New Issue
Block a user