Compare commits
No commits in common. "master" and "Help" have entirely different histories.
77
Makefile
77
Makefile
@ -1,77 +1,14 @@
|
||||
|
||||
ignore_file = .git/info/exclude
|
||||
|
||||
|
||||
.PHONY: help
|
||||
|
||||
help: ## Print the help message
|
||||
@awk 'BEGIN {FS = ":.*?## "} /^[0-9a-zA-Z._-]+:.*?## / {printf "\033[36m%s\033[0m : %s\n", $$1, $$2}' $(MAKEFILE_LIST) | \
|
||||
sort | \
|
||||
column -s ':' -t
|
||||
|
||||
.PHONY: check
|
||||
check: ## Check you have all dependencies
|
||||
@command -v graph-easy >/dev/null || { echo "Install perl-graph-easy" && exit 1 ;}
|
||||
@command -v recsel >/dev/null || { echo "Install recutils" && exit 1 ;}
|
||||
@command -v lowdown >/dev/null || { echo "Install lowdown" && exit 1 ;}
|
||||
@echo "All dependencies installed"
|
||||
map.txt: map.ge ## Making map.txt
|
||||
grep -v '# unimportant' $< | graph-easy --boxart > $@
|
||||
cat $@
|
||||
|
||||
########## Network Map ##########
|
||||
|
||||
graph_program != type graph-easy > /dev/null && printf graph-easy || printf dot
|
||||
|
||||
graph_cmd = graph-easy --boxart
|
||||
|
||||
queries = queries authqueries
|
||||
|
||||
query_formats = $(patsubst %, .dbs/%.txt, $(queries))
|
||||
|
||||
dotquery_formats = $(patsubst %, .dbs/%.dot, $(queries))
|
||||
|
||||
.dbs/: | $(ignore_file)
|
||||
mkdir $@
|
||||
|
||||
ignored += .dbs/
|
||||
|
||||
$(query_formats): .dbs/%.txt: | .dbs/
|
||||
echo "[ {{name}} ] -- $(basename $(@F)) --> [ {{$(basename $(@F))}} ]" > $@
|
||||
|
||||
$(dotquery_formats): .dbs/%.dot: | .dbs/
|
||||
echo '{{name}} -> {{$(basename $(@F))}} [ label="$(basename $(@F))" ];' > $@
|
||||
|
||||
ifeq ($(graph_program),dot)
|
||||
map_file = network.png
|
||||
else
|
||||
map_file = network.txt
|
||||
endif
|
||||
|
||||
ignored += $(map_file)
|
||||
|
||||
.PHONY: map
|
||||
map: $(map_file) ## Generate a network map
|
||||
|
||||
network.txt: .dbs/network.txt
|
||||
$(graph_cmd) < $<
|
||||
|
||||
.dbs/network.txt: network.rec $(query_formats)
|
||||
$(RM) $@
|
||||
$(foreach relation, $(queries), \
|
||||
recsel $< -t lxc -e "$(relation) != ''" -p name,$(relation) | recfmt -f .dbs/$(relation).txt >> $@ ;\
|
||||
)
|
||||
|
||||
.dbs/network.dot: network.rec $(dotquery_formats)
|
||||
echo 'digraph network {' > $@
|
||||
$(foreach relation, $(queries), \
|
||||
recsel $< -t lxc -e "$(relation) != ''" -p name,$(relation) | recfmt -f .dbs/$(relation).dot >> $@ ;\
|
||||
)
|
||||
echo '}' >> $@
|
||||
|
||||
network.png: .dbs/network.dot $(ignore_file)
|
||||
dot -T png < $< > $@
|
||||
|
||||
##########
|
||||
|
||||
$(ignore_file): $(MAKEFILE_LIST)
|
||||
echo $(ignored) | tr ' ' '\n' > $@
|
||||
|
||||
clean:
|
||||
$(RM) -r $(ignored)
|
||||
full_map.txt: map.ge ## Generating full_map.txt with graph-easy
|
||||
graph-easy --boxart < $< > $@
|
||||
cat $@
|
||||
|
||||
64
README.md
64
README.md
@ -2,11 +2,6 @@ These setup files provide the text-only configurations for DMZ.
|
||||
|
||||
*It should not contain private data.*
|
||||
|
||||
# Dependencies
|
||||
|
||||
- `recutils`
|
||||
- (optional) `graph-easy` (the package may be called `perl-graph-easy`)
|
||||
|
||||
# Aspirations
|
||||
|
||||
- Each service should reside in its own directory.
|
||||
@ -18,62 +13,5 @@ These setup files provide the text-only configurations for DMZ.
|
||||
- Idempotency.
|
||||
- All secrets stored elsewhere (probably in the `dmzadmin` repo)
|
||||
- Any maintenance scripts.
|
||||
- Configurations should reside in shadow-directories, e.g. a backup `soft-serve`'s `config.yaml` should reside in this repo under `splint.rs/soft-serve/etc/soft/config.yaml`.
|
||||
|
||||
# Network Database
|
||||
|
||||
I have a half-baked plan to finally make use of plain-text databases, and it's already half-working.
|
||||
Try these commands:
|
||||
|
||||
Ask what types of _rec_ords it contains:
|
||||
|
||||
## Database
|
||||
|
||||
```sh
|
||||
recinf network.rec
|
||||
```
|
||||
|
||||
### Select queries
|
||||
|
||||
Select with `recsel`, then specify the database (.rec) and type of record (like table in db).
|
||||
|
||||
- `--include-descriptors` or `-d`
|
||||
- `--type` or `-t`
|
||||
- `--expression` or `-e`
|
||||
- `--quick` or `-q`
|
||||
|
||||
```sh
|
||||
recsel network.rec --type router
|
||||
recsel network.rec -d -t lxc
|
||||
```
|
||||
|
||||
User `-q` for a `--quick` selection, or `-e` for more precise selections.
|
||||
|
||||
```sh
|
||||
recsel network.rec --type lxc --quick wiki
|
||||
recsel network.rec -t lxc -q nginx
|
||||
recsel network.rec -t lxc -e "name ~ 'nginx'"
|
||||
recsel network.rec -t lxc -e "name = 'nginx12'"
|
||||
```
|
||||
|
||||
### Insert queries
|
||||
|
||||
Insert a new record with `recins`.
|
||||
|
||||
```sh
|
||||
recins network.rec -t lxc -r "name: bob" -r "service: bob" -r "host: moxx"
|
||||
```
|
||||
|
||||
### Update queries
|
||||
|
||||
If you can select something, you can also set its fields with `recset`.
|
||||
|
||||
Use `-f` to set the `--field`, and `-a` to `--add`, or `-s` to `--set`.
|
||||
|
||||
|
||||
```sh
|
||||
recset network.rec -t lxc -e "name = 'nginx12'" -f proxies -a soft-serve
|
||||
recsel network.rec -t lxc -e "name = 'nginx11'" -p proxies[0]
|
||||
recset network.rec -t lxc -e" name = 'nginx11'" -f proxies[0] -s wiki9
|
||||
```
|
||||
- Configurations should reside in shadow-directories, e.g. a backup of `/etc/soft/config` should reside in this repo under `etc/soft/config`.
|
||||
|
||||
|
||||
26
docs/dmzrs/README.md
Normal file
26
docs/dmzrs/README.md
Normal file
@ -0,0 +1,26 @@
|
||||
Add this configuration to ~/.ssh/config file
|
||||
|
||||
Host dmzkrovdmzrs12
|
||||
Hostname veyxphzuqnooc7wb7utfza3joaoopgqgwp6l6d4en5yfmyr7kxvminqd.onion
|
||||
User root
|
||||
IdentityFile ~/.ssh/id_rsa
|
||||
PasswordAuthentication no
|
||||
|
||||
Now you can log in by typing:
|
||||
torsocks ssh dmzkrovdmzrs12
|
||||
|
||||
Install all needed packages
|
||||
apt install rsync git nginx
|
||||
git clone https://gitea.dmz.rs/Decentrala/website
|
||||
|
||||
Run updatewebsite.sh script every minute using crontab (run "crontab -e")
|
||||
This fill automaticlly pull from git repo and regenerate events page
|
||||
|
||||
Add nginx-dmz.rs.conf to /etc/nginx/sites-available/dmz.rs and create a symlink
|
||||
from /etc/nginx/sites-enabled/dmz.rs to that file
|
||||
You can do this by running:
|
||||
ln -s /etc/nginx/sites-available/dmz.rs /etc/nginx/sites-enabled/dmz.rs
|
||||
|
||||
Increase server_names_hash_bucket_size to 256 in /etc/nginx/nginx.conf in order to support onion addresses.
|
||||
|
||||
In the nginx configuration /account/ is redirected to luser (https://gitea.dmz.rs/fram3d/luser) instance running at 192.168.1.211
|
||||
@ -1,9 +1,3 @@
|
||||
---
|
||||
title: ejabberd configurations
|
||||
section: 6
|
||||
source: Decentrala
|
||||
---
|
||||
|
||||
#On your PC
|
||||
Add this configuration to ~/.ssh/config
|
||||
|
||||
@ -17,3 +17,16 @@ VMID Name
|
||||
111 taskmanager12
|
||||
112 stopreklamama12
|
||||
|
||||
## srv1
|
||||
|
||||
VMID Name
|
||||
102 tor12
|
||||
103 dendrite
|
||||
106 icecast12
|
||||
107 mariadb12
|
||||
108 mpd12
|
||||
109 ympd
|
||||
111 sshfs11
|
||||
113 ollama12
|
||||
114 chatbot12
|
||||
115 goodvibes12
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 115
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 126
|
||||
---
|
||||
@ -1,40 +0,0 @@
|
||||
Add this configuration to `~/.ssh/config` file
|
||||
|
||||
```
|
||||
Host dmzkrovdmzrs12
|
||||
Hostname veyxphzuqnooc7wb7utfza3joaoopgqgwp6l6d4en5yfmyr7kxvminqd.onion
|
||||
User root
|
||||
IdentityFile ~/.ssh/id_rsa
|
||||
PasswordAuthentication no
|
||||
|
||||
```
|
||||
|
||||
Now you can log in by typing:
|
||||
|
||||
|
||||
```bash
|
||||
torsocks ssh dmzkrovdmzrs12
|
||||
```
|
||||
|
||||
Install all needed packages:
|
||||
|
||||
|
||||
```bash
|
||||
apt install rsync git nginx
|
||||
git clone https://gitea.dmz.rs/Decentrala/website
|
||||
```
|
||||
|
||||
Run `updatewebsite.sh` script every minute using `crontab` (run "`crontab -e`")
|
||||
This fill automatically pull from git repo and regenerate events page
|
||||
|
||||
Add `nginx-dmz.rs.conf` to `/etc/nginx/sites-available/dmz.rs` and create a symlink
|
||||
from `/etc/nginx/sites-enabled/dmz.rs` to that file.
|
||||
You can do this by running:
|
||||
|
||||
```bash
|
||||
ln -s /etc/nginx/sites-available/dmz.rs /etc/nginx/sites-enabled/dmz.rs
|
||||
```
|
||||
|
||||
Increase `server_names_hash_bucket_size` to 256 in `/etc/nginx/nginx.conf` in order to support onion addresses.
|
||||
|
||||
In the `nginx` configuration /account/ is redirected to the `luser` [instance](https://gitea.dmz.rs/fram3d/luser) running at `192.168.1.211`.
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 122
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 118
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 124
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 111
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 106
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 119
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 109
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 117
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 104
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 121
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 108
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 127
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 113
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 105
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 116
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 123
|
||||
---
|
||||
@ -1,5 +0,0 @@
|
||||
---
|
||||
VMID: 114
|
||||
---
|
||||
|
||||
[wiki page](https://wiki.dmz.rs/en/sysadmin/ssh)
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 112
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 101
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 125
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 120
|
||||
---
|
||||
@ -1,56 +0,0 @@
|
||||
---
|
||||
VMID: 103
|
||||
---
|
||||
|
||||
[Wireguard VPN quickstart](https://www.wireguard.com/quickstart)
|
||||
|
||||
Check `dmzadmin` for `wireguard.gpg` to know who to contact for access
|
||||
|
||||
---
|
||||
|
||||
### Client config
|
||||
|
||||
Client config example
|
||||
`x` is the assigned 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
|
||||
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Server config
|
||||
|
||||
New user/client needs to provide their wireguard `publickey` and new ip on the network needs to be assigned (`x`)
|
||||
check the server config file `/etc/wireguard/wg0.conf` to find free address
|
||||
|
||||
```sh
|
||||
sudo wg set wg0 peer <client_public_key> allowed-ips 192.168.164.x/32
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
Command to resolve IP clashing with current and wireguard network, if needed
|
||||
|
||||
```shell
|
||||
ip route add <ip> dev <wg0>
|
||||
```
|
||||
|
||||
- `ip` you want to resolve -> for wireguard VM 192.168.1.10
|
||||
- `wg0` name of the wireguard config
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 102
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 101
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 102
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 110
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 109
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 107
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 100
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 106
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 108
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 104
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 112
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 111
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 103
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 105
|
||||
---
|
||||
@ -1,15 +0,0 @@
|
||||
# List of containers
|
||||
|
||||
## srv1
|
||||
|
||||
VMID Name
|
||||
102 tor12
|
||||
103 dendrite
|
||||
106 icecast12
|
||||
107 mariadb12
|
||||
108 mpd12
|
||||
109 ympd
|
||||
111 sshfs11
|
||||
113 ollama12
|
||||
114 chatbot12
|
||||
115 goodvibes12
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 114
|
||||
---
|
||||
@ -1,7 +0,0 @@
|
||||
---
|
||||
VMID: 106
|
||||
---
|
||||
|
||||
[Project page](https://cryptpad.org/)
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 103
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 115
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 106
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 107
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 108
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 113
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 111
|
||||
---
|
||||
@ -1,8 +0,0 @@
|
||||
---
|
||||
VMID: 120
|
||||
---
|
||||
|
||||
[Project page](https://privatebin.info/)
|
||||
|
||||
Hosted on [subdomain on dmz](https://pastebin.dmz.rs/)
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
---
|
||||
VMID: 121
|
||||
---
|
||||
|
||||
[Project git repo](https://github.com/searxng/searxng)
|
||||
|
||||
Hosted on [subdomain on dmz](https://search.dmz.rs/)
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
---
|
||||
VMID: 100
|
||||
---
|
||||
|
||||
[wiki page](https://wiki.dmz.rs/en/sysadmin/ssh)
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 102
|
||||
---
|
||||
@ -1,3 +0,0 @@
|
||||
---
|
||||
VMID: 109
|
||||
---
|
||||
39
map.ge
Normal file
39
map.ge
Normal file
@ -0,0 +1,39 @@
|
||||
# Network map of Decentrala. Use with:
|
||||
# graph-easy --boxart < netmap.txt
|
||||
|
||||
(Mox
|
||||
[ m_router ]{label: router ;}
|
||||
[ wireguard ] --> [ m_nginx ]{label: nginx-11 ;}
|
||||
[ wiki ] --> [ m_nginx ]
|
||||
[ gitea ] --> [ m_nginx ]
|
||||
[ tor11 ] --> [ m_nginx ] --> [ m_router ]
|
||||
[ smtp ]
|
||||
)
|
||||
|
||||
(Serverko
|
||||
[ s_nginx ]{label: nginx-12 ;}
|
||||
[ s_router ]{label: router ;}
|
||||
[ s_nginx ] --> [ nextcloud ]
|
||||
[ s_nginx ] --> [ tor12 ]
|
||||
[ s_nginx ] --> [ s_router ]
|
||||
)
|
||||
|
||||
(splint.rs # unimportant
|
||||
[ soft-serve ] # unimportant
|
||||
[ mail-cache ]# unimportant
|
||||
) # unimportant
|
||||
|
||||
[ tor12 ] <..> [ onions ] <..> [ tor11 ]
|
||||
[ m_router ] <..> [ BGP ] <..> [ madness ] <..> [ s_router ]
|
||||
[ smtp ] <..> [ madness ]
|
||||
[ madness ] <..> [ mail-cache ]# unimportant
|
||||
[ A ]{label: "" ;}
|
||||
[ B ]{label: "" ;}
|
||||
[ C ]{label: "" ;}
|
||||
[ D ]{label: "" ;}
|
||||
[ onions ] <..> [ A ]
|
||||
[ onions ] <..> [ B ]
|
||||
[ A ] <..> [ C ]
|
||||
[ B ] <..> [ D ]
|
||||
|
||||
(Sharks! [ D ])
|
||||
88
network.rec
88
network.rec
@ -1,88 +0,0 @@
|
||||
%rec: router
|
||||
%doc: Routers, or possibly modems?
|
||||
|
||||
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 run VMs or containters.
|
||||
%key: name
|
||||
|
||||
name: moxx
|
||||
location: kralizec
|
||||
|
||||
name: Serverko
|
||||
location: krov
|
||||
|
||||
%rec: lxc
|
||||
%doc: A container, usually on a Proxmox host.
|
||||
%type: host rec host
|
||||
|
||||
name: nginx11
|
||||
gateway: ISP-router
|
||||
host: moxx
|
||||
proxies: wiki11
|
||||
proxies: gitea11
|
||||
proxies: forum11
|
||||
proxies: ejabberd11
|
||||
proxies: dmzrs
|
||||
|
||||
name: LDAP
|
||||
host: moxx
|
||||
|
||||
name: website
|
||||
host: moxx
|
||||
authqueries: LDAP
|
||||
queries: postgresql11
|
||||
service: dmzrs
|
||||
service: flask accounts
|
||||
|
||||
name: gitea11
|
||||
service: gitea
|
||||
host: moxx
|
||||
authqueries: LDAP
|
||||
queries: postgresql11
|
||||
|
||||
name: ejabberd11
|
||||
service: ejabberd
|
||||
host: moxx
|
||||
authqueries: LDAP
|
||||
queries: postgresql11
|
||||
|
||||
name: forum11
|
||||
service: forum
|
||||
host: moxx
|
||||
authqueries: LDAP
|
||||
queries: postgresql11
|
||||
|
||||
name: postfix11
|
||||
service: postfix
|
||||
authqueries: LDAP
|
||||
|
||||
name: tor11
|
||||
service: tor
|
||||
host: moxx
|
||||
|
||||
name: postgresql11
|
||||
service: postgresql
|
||||
host: moxx
|
||||
|
||||
name: wiki11
|
||||
service: wiki
|
||||
host: moxx
|
||||
authqueries: LDAP
|
||||
|
||||
name: nginx12
|
||||
host: Serverko
|
||||
|
||||
name: nextcloud
|
||||
host: Serverko
|
||||
|
||||
name: tor12
|
||||
host: nginx
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
---
|
||||
volume: Decentrala
|
||||
section: 6
|
||||
title: git aliases
|
||||
author: Malin
|
||||
source: dmz.rs
|
||||
---
|
||||
|
||||
## Aliases
|
||||
|
||||
Put these in `~/.bash_aliases`
|
||||
|
||||
```
|
||||
alias gb='git branch'
|
||||
alias gc='git add -p . && git commit'
|
||||
alias gd="git diff --word-diff"
|
||||
alias gl='git log --graph --show-signature'
|
||||
alias gla="git log --all --decorate --oneline --graph"
|
||||
alias gm='git merge'
|
||||
alias gis='git status'
|
||||
```
|
||||
|
||||
## Dangerous Aliases
|
||||
|
||||
Get a fuzzy-finder, like `fzy,` or `sk` (called `sk-im` in the repos), and checkout faster:
|
||||
|
||||
```
|
||||
alias gco='git checkout --recurse-submodules $(sk -c "git branch | cut -c 3-")'
|
||||
```
|
||||
|
||||
Delete all changes and start again instantly:
|
||||
|
||||
```
|
||||
alias grs='git reset --hard HEAD'
|
||||
```
|
||||
|
||||
Push to remotes that don't use http:
|
||||
|
||||
```
|
||||
alias gpa='git remote show | while read remote; do git remote get-url $remote | grep -qv http && git push $remote; done'
|
||||
```
|
||||
103
setup/ssh_FAQ.md
103
setup/ssh_FAQ.md
@ -1,103 +0,0 @@
|
||||
---
|
||||
volume: Decentrala
|
||||
section: 6
|
||||
title: ssh setup
|
||||
author: Malin
|
||||
source: dmz.rs
|
||||
---
|
||||
|
||||
## Step 1: Basic `ssh`
|
||||
|
||||
> I did stuff with my `ssh` and now things don't work. What do?
|
||||
|
||||
Check the permissions on your `ssh` directory:
|
||||
|
||||
```bash
|
||||
$ ls -d ~/.ssh
|
||||
drwxr-x--- - ghost 3 Dec 12:55 /home/ghost/.ssh
|
||||
```
|
||||
|
||||
This is wrong, because anyone in your `~` can see you `ssh` configuration files.
|
||||
|
||||
```bash
|
||||
$ chmod -R 600 ~/.ssh
|
||||
$ ls -d ~/.ssh
|
||||
drw------- - ghost 3 Dec 12:55 /home/ghost/.ssh
|
||||
```
|
||||
|
||||
This is also wrong - entering a directory is the same as executing it.
|
||||
If you can't 'execute' the directory, you cannot enter it, and `ssh` cannot read the files.
|
||||
|
||||
```bash
|
||||
$ chmod -R 700 ~/.ssh
|
||||
$ ls -l ~/.config
|
||||
|
||||
-rwx------ 1 ghost dmz 578 Dec 27 2022 authorized hosts
|
||||
-rwx------ 1 ghost dmz 1145 Dec 27 2022 authorized keys
|
||||
-rwx------ 2 ghost dmz 366 Dec 14 18:36 config
|
||||
-rwx------ 1 ghost dmz 419 Dec 11 2023 id ed25519
|
||||
-rwx------ 1 ghost dmz 106 Dec 11 2023 id ed25519.pub
|
||||
-rwx------ 1 ghost dmz 2610 Dec 27 2022 id rsa
|
||||
-rwx------ 1 ghost dmz 578 Dec 27 2022 id rsa.pub
|
||||
-rwx------ 1 ghost dmz 28269 Dec 28 17:32 known hosts
|
||||
```
|
||||
|
||||
Now all the files have 'read, write, and execute', but only for `$USER`.
|
||||
|
||||
## Step 2: The Config File
|
||||
|
||||
> I have 43 different `ssh` keys. Something doesn't work with a program. What do?
|
||||
|
||||
- Option 1: Delete all of them and stop asking Santa for `ssh` keys.
|
||||
- Option 2: Define which one you want to use in the `~/.ssh/config` file.
|
||||
|
||||
|
||||
```
|
||||
Host soft
|
||||
HostName soft.dmz.rs
|
||||
Port 2222
|
||||
IdentityFile ~/.ssh/id rsa
|
||||
Host dmz
|
||||
HostName dmz.rs
|
||||
Port 123
|
||||
User root
|
||||
Host krov
|
||||
HostName dmz.rs
|
||||
Port 5555
|
||||
User ghost
|
||||
Host june
|
||||
HostName 192.168.1.100
|
||||
User ghost
|
||||
ProxyJump krov
|
||||
```
|
||||
|
||||
|
||||
The first example lets you go to the `soft-serve` git-server just by typing
|
||||
|
||||
```bash
|
||||
$ ssh soft
|
||||
```
|
||||
|
||||
If you're not sure if ssh is using the right key, try with `-v` for 'verbose mode'.
|
||||
|
||||
```bash
|
||||
$ ssh -vv soft
|
||||
```
|
||||
|
||||
If you're not sure if ssh is using the right key, try with `-v` for 'verbose mode'.
|
||||
|
||||
> `git` is not working with `ssh`
|
||||
|
||||
`git` will not presume to use your `ssh` config file unless you tell it:
|
||||
|
||||
```bash
|
||||
$ GIT_SSH_COMMAND="ssh -F ~/.ssh/config" git pull
|
||||
```
|
||||
|
||||
If that works, you can make the change permanent for that one repository:
|
||||
|
||||
|
||||
```bash
|
||||
$ git config core.sshCommand "ssh -F ~/.ssh/config"
|
||||
```
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
# This make file produces the smtp daemon for the current backup domain: splint.rs
|
||||
|
||||
# It is missing the cert, so you'll have to make another.
|
||||
# It hasn't been tested in a few years, and I have no idea how to make a
|
||||
# containerized test which will check DNS, and SSL certificates.
|
||||
|
||||
DOMAIN=splint.rs
|
||||
|
||||
@ -1 +0,0 @@
|
||||
`smtp` provides email backups, in case kralizec goes offline.
|
||||
@ -1,36 +0,0 @@
|
||||
---
|
||||
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`
|
||||
|
||||
# Adding Users
|
||||
|
||||
Summary:
|
||||
|
||||
`ssh -p 2222 soft.dmz.rs user --help`
|
||||
|
||||
Add user `ana` to the `fixme` repository:
|
||||
|
||||
```bash
|
||||
user=ana
|
||||
repo=fixme
|
||||
ssh -p 2222 soft.dmz.rs user create $user
|
||||
key="$(cat ~/dmzadmin/ssh_keys/alice.pub)"
|
||||
ssh -p 2222 soft.dmz.rs user add-pubkey "$key" $user
|
||||
ssh -p 2222 soft.dmz.rs repo collab add $repo $user
|
||||
ssh -p 2222 soft.dmz.rs user info $user
|
||||
```
|
||||
|
||||
Add `bojan` as an admin (who can see an change all repositories):
|
||||
|
||||
|
||||
```bash
|
||||
user=bojan
|
||||
sshkey="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5g6oP6+DyFhkIrN4pRcvsQ7RgNavEyzN2kH8yOB6mA bojan@posteo.net"
|
||||
ssh -p 2222 soft.dmz.rs user create --admin --key "$sshkey" "$user"
|
||||
```
|
||||
@ -1,27 +0,0 @@
|
||||
---
|
||||
source: Decentrala
|
||||
section: 6
|
||||
title: Soft-Serve Webhooks
|
||||
---
|
||||
|
||||
### Soft serve webhooks
|
||||
|
||||
Soft serve supports [webhooks](https://en.wikipedia.org/wiki/Webhook)
|
||||
|
||||
Webhooks allow us to get notified on some web server when some events occur on the soft serve git server. Currently supported events that can be subscribed to (for a specific repo) are:
|
||||
|
||||
- branch_tag_create
|
||||
- branch_tag_delete
|
||||
- collaborator
|
||||
- push
|
||||
- repository
|
||||
- repository_visibility_change
|
||||
|
||||
See help page for repo webhooks
|
||||
`ssh -p 2222 soft.dmz.rs repo webhook --help`
|
||||
|
||||
##### Example
|
||||
|
||||
An example for using a webhook could be that you want to be notified when anyone pushes commits to `boban` repo
|
||||
You could create a webhook that will trigger on the push event of the boban repo and send a request to boban.dmz.rs/push url (where you could host a webapp that listens for that request). The webapp will react to it by sending a xmpp message with details on which commits where pushed etc.
|
||||
`webhook create boban boban.dmz.rs/push --events push`
|
||||
Loading…
x
Reference in New Issue
Block a user