From f9e8deec17ea1784b45e7ea620ed0fef49170359 Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Sat, 8 Oct 2022 11:55:21 +0330 Subject: update --- .config/glow/dark.json | 194 +++++++++++++++++++++ .config/glow/glow.yml | 10 ++ .newsboat/urls | 3 + .psqlrc | 8 +- .w3m/keymap | 3 +- .zshrc | 12 +- bin/xman | 2 +- docker/dummy_registry.sh | 3 + docker/redis.sh | 3 + ipv6/ns_bind.sh | 4 +- k3s/k3s.service.env | 6 + k3s/registries.yaml | 4 + kubernetes/bitlbee-purple/bitlbee-data-volume.yaml | 12 ++ kubernetes/bitlbee-purple/bitlbee-deployment.yaml | 40 ++++- kubernetes/bitlbee-purple/bitlbee.conf | 132 ++++++++++++++ kubernetes/bitlbee-purple/conf/bitlbee.conf | 132 -------------- kubernetes/bitlbee-purple/deploy.sh | 9 + kubernetes/debug/debug-deployment.yaml | 46 +++++ qtbrowser/config.py | 9 +- terminaldweller.com/cgit/bootstrap/Dockerfile | 2 +- terminaldweller.com/cgit/docker-compose.yaml | 3 +- terminaldweller.com/haproxy/haproxy.cfg | 40 +++-- tmux/date.sh | 4 +- 23 files changed, 507 insertions(+), 174 deletions(-) create mode 100644 .config/glow/dark.json create mode 100644 .config/glow/glow.yml create mode 100755 docker/dummy_registry.sh create mode 100755 docker/redis.sh create mode 100644 k3s/k3s.service.env create mode 100644 k3s/registries.yaml create mode 100644 kubernetes/bitlbee-purple/bitlbee-data-volume.yaml create mode 100644 kubernetes/bitlbee-purple/bitlbee.conf delete mode 100644 kubernetes/bitlbee-purple/conf/bitlbee.conf create mode 100755 kubernetes/bitlbee-purple/deploy.sh create mode 100644 kubernetes/debug/debug-deployment.yaml diff --git a/.config/glow/dark.json b/.config/glow/dark.json new file mode 100644 index 0000000..6020ec3 --- /dev/null +++ b/.config/glow/dark.json @@ -0,0 +1,194 @@ +{ + "document": { + "block_prefix": "\n", + "block_suffix": "\n", + "color": "23", + "margin": 2 + }, + "block_quote": { + "indent": 1, + "indent_token": "│ " + }, + "paragraph": {}, + "list": { + "level_indent": 2 + }, + "heading": { + "block_suffix": "\n", + "color": "39", + "bold": true + }, + "h1": { + "prefix": "#", + "suffix": " ", + "color": "25", + "bold": true + }, + "h2": { + "prefix": "## " + }, + "h3": { + "prefix": "### " + }, + "h4": { + "prefix": "#### " + }, + "h5": { + "prefix": "##### " + }, + "h6": { + "prefix": "###### ", + "color": "35", + "bold": false + }, + "text": {}, + "strikethrough": { + "crossed_out": true + }, + "emph": { + "italic": true + }, + "strong": { + "bold": true + }, + "hr": { + "color": "240", + "format": "\n--------\n" + }, + "item": { + "block_prefix": "• " + }, + "enumeration": { + "block_prefix": ". " + }, + "task": { + "ticked": "[✓] ", + "unticked": "[ ] " + }, + "link": { + "color": "38", + "underline": true + }, + "link_text": { + "color": "35", + "bold": true + }, + "image": { + "color": "99", + "underline": true + }, + "image_text": { + "color": "243", + "format": "Image: {{.text}} →" + }, + "code": { + "prefix": " ", + "suffix": " ", + "color": "203", + "background_color": "236" + }, + "code_block": { + "color": "244", + "margin": 2, + "chroma": { + "text": { + "color": "#C4C4C4" + }, + "error": { + "color": "#F1F1F1", + "background_color": "#F05B5B" + }, + "comment": { + "color": "#676767" + }, + "comment_preproc": { + "color": "#FF875F" + }, + "keyword": { + "color": "#00AAFF" + }, + "keyword_reserved": { + "color": "#FF5FD2" + }, + "keyword_namespace": { + "color": "#FF5F87" + }, + "keyword_type": { + "color": "#6E6ED8" + }, + "operator": { + "color": "#EF8080" + }, + "punctuation": { + "color": "#E8E8A8" + }, + "name": { + "color": "#C4C4C4" + }, + "name_builtin": { + "color": "#FF8EC7" + }, + "name_tag": { + "color": "#B083EA" + }, + "name_attribute": { + "color": "#7A7AE6" + }, + "name_class": { + "color": "#F1F1F1", + "underline": true, + "bold": true + }, + "name_constant": {}, + "name_decorator": { + "color": "#FFFF87" + }, + "name_exception": {}, + "name_function": { + "color": "#00D787" + }, + "name_other": {}, + "literal": {}, + "literal_number": { + "color": "#6EEFC0" + }, + "literal_date": {}, + "literal_string": { + "color": "#C69669" + }, + "literal_string_escape": { + "color": "#AFFFD7" + }, + "generic_deleted": { + "color": "#FD5B5B" + }, + "generic_emph": { + "italic": true + }, + "generic_inserted": { + "color": "#00D787" + }, + "generic_strong": { + "bold": true + }, + "generic_subheading": { + "color": "#777777" + }, + "background": { + "background_color": "#373737" + } + } + }, + "table": { + "center_separator": "┼", + "column_separator": "│", + "row_separator": "─" + }, + "definition_list": {}, + "definition_term": {}, + "definition_description": { + "block_prefix": "\n🠶 " + }, + "html_block": {}, + "html_span": {} +} diff --git a/.config/glow/glow.yml b/.config/glow/glow.yml new file mode 100644 index 0000000..fda16f5 --- /dev/null +++ b/.config/glow/glow.yml @@ -0,0 +1,10 @@ +# style name or JSON path (default "auto") +style: "auto" +# show local files only; no network (TUI-mode only) +local: false +# mouse support (TUI-mode only) +mouse: false +# use pager to display markdown +pager: false +# word-wrap at width +width: 160 diff --git a/.newsboat/urls b/.newsboat/urls index 7da3647..d005578 100644 --- a/.newsboat/urls +++ b/.newsboat/urls @@ -15,6 +15,7 @@ http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=B http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=torproject&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~TorProject"_("Twitter") http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=HiveBlockchain&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Hive"_("Twitter") http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=PrivexInc&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Privex"_("Twitter") +http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=binance&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~binance"_("Twitter") # (Youtube) # Horror @@ -36,6 +37,8 @@ https://www.youtube.com/feeds/videos.xml?user=CreepsMcPasta "~CreepsMcPasta"_("y https://www.youtube.com/feeds/videos.xml?user=WeArEraW11 "~ScaryJUJU"_("youtube") https://www.youtube.com/feeds/videos.xml?channel_id=UCuoMasRkMhlj1VNVAOJdw5w "~Local58TV"_("youtube") https://www.youtube.com/feeds/videos.xml?channel_id=UC9YXCCz-A28lxhMA-ArfBaA "~Gemini_Home_Entertainment"_("youtube") +https://www.youtube.com/feeds/videos.xml?channel_id=UCxMZO9A4Jixjr9lbgeBiQ6w "~Vormithrax"_("youtube") + # Tech https://www.youtube.com/feeds/videos.xml?channel_id=UC-91UA-Xy2Cvb98deRXuggA "~Joshua Fluke"_("youtube") https://www.youtube.com/feeds/videos.xml?channel_id=UC17mJJnvzAa_e9qQqLIfIeQ "~Semicolon&Sons"_("youtube") diff --git a/.psqlrc b/.psqlrc index 8e774e6..415a184 100644 --- a/.psqlrc +++ b/.psqlrc @@ -2,7 +2,7 @@ /* prompts */ \set PROMPT1 '\x1b[38;5;34m%n\x1b[0m@\x1b[38;5;39m%M\x1b[0m:\x1b[38;5;37m%> \x1b[38;5;69m%`date +%H:%M:%S` \x1b[38;5;4m[%/] \x1b[38;5;31m%x\x1b[38;5;104m%#\x1b[38;5;34m%R\n\x1b[38;5;28m>>>\x1b[0m' -\set PROMPT2 '\x1b[38;5;39m%M\x1b[0m:\x1b[38;5;37m%> \x1b[38;5;34m%n\x1b[0m@\x1b[38;5;4m%/\x1b[38;5;34m%R \x1b[38;5;104m%# \n\x1b[38;5;28m>>>\x1b[0m' +\set PROMPT2 '... ' \set PROMPT3 '\x1b[38;5;38m>>>\x1b[0m' \pset null '[null]' @@ -16,9 +16,8 @@ \set HISTFILE ~/.psql_history- :DBNAME \set HISTCONTROL ignoredups - \set ON_ERROR_STOP on -\set ON_ERROR_ROLLBACK off +\set ON_ERROR_ROLLBACK interactive \set COMP_KEYWORD_CASE upper @@ -26,4 +25,7 @@ \pset unicode_column_linestyle single \pset unicode_header_linestyle double +\set version 'SELECT version();' +\set extensions 'select * from pg_available_extensions;' + \unset QUIET diff --git a/.w3m/keymap b/.w3m/keymap index ce8b69e..c950b63 100644 --- a/.w3m/keymap +++ b/.w3m/keymap @@ -124,7 +124,8 @@ keymap go COMMAND "SHELL /usr/lib/w3m/cgi-bin/goto_clipboard.cgi" keymap SPC-s COMMAND "TAB_GOTO searx.terminaldweller.com" keymap d COMMAND "EXTERN 'echo %s >> ~/.w3m/RestoreTab.txt' ; CLOSE_TAB" -keymap u TAB_GOTO /usr/lib/w3m/cgi-bin/restore_tab.cgi +#keymap u TAB_GOTO /usr/lib/w3m/cgi-bin/restore_tab.cgi +keymap u TAB_GOTO /home/devi/.w3m/cgi-bin/restore_tab.cgi keymap SPC-m CURSOR_MIDDLE keymap SPC-l CURSOR_BOTTOM diff --git a/.zshrc b/.zshrc index 9973e39..41c1945 100644 --- a/.zshrc +++ b/.zshrc @@ -192,10 +192,12 @@ alias zh_freebsd="zssh dev@192.168.90.15" alias zh_linux="zssh dev@192.168.90.17" alias zh_router_root="zssh root@192.168.90.71" alias zh_router_admin="zssh admin@192.168.90.71" -alias youtube_dl="proxychains4 -f /home/devi/proxies/ca/proxychains.conf youtube-dl" +alias youtube_dl="proxychains4 -f /home/devi/proxies/ice/proxychains.conf youtube-dl" alias campv="proxychains4 -f /home/devi/proxies/ca/proxychains.conf mpv --no-video" alias tormpv="torsocks mpv --no-video" -alias youtube="proxychains4 -f /home/devi/proxies/ca/proxychains.conf mpv --ytdl-format=160+249" +alias youtube144="proxychains4 -f /home/devi/proxies/ice/proxychains.conf mpv --ytdl-format=160+249" +alias youtube360="proxychains4 -f /home/devi/proxies/ice/proxychains.conf mpv --ytdl-format=243+160" +alias youtube480="proxychains4 -f /home/devi/proxies/ice/proxychains.conf mpv --ytdl-format=244+140" alias tridactylrc="vim ~/scripts/.tridactylrc" alias fixtridactylrc="cp ~/scripts/.tridactylrc ~/" alias man="man -O width=210" @@ -253,6 +255,12 @@ alias phone_net="sudo ip netns exec phone_ns" alias home_net="sudo ip netns exec home_ns" alias netbsd_bmake="/usr/pkg/bin/bmake" alias hive_node_1="ssh ubuntu@95.217.143.98" +alias ca_proxy="proxychains4 -q -f ~/proxies/ca/proxychains.conf" +alias fr_proxy="proxychains4 -q -f ~/proxies/fr/proxychains.conf" +alias nd_proxy="proxychains4 -q -f ~/proxies/nd/proxychains.conf" +alias swe_proxy="proxychains4 -q -f ~/proxies/swe/proxychains.conf" +alias ir_proxy="proxychains4 -q -f ~/proxies/ir/proxychains.conf" +alias ice_proxy="proxychains4 -q -f ~/proxies/ice/proxychains.conf" # change the 4th terminal color to #0000ff # echo -e '\e]P40000ff' diff --git a/bin/xman b/bin/xman index a2220ec..63f686a 100755 --- a/bin/xman +++ b/bin/xman @@ -9,7 +9,7 @@ SOCKS_PROXY=socks5://127.0.0.1:9050 xlocate "man/man..\?/$1\.[0-9]" 2>/dev/null while read -r pkg page; do page=${page#* -> } # xbps-query --cat=$page ${pkg%-*} | mandoc -O width=205 -a - SOCKS_PROXY=socks5://127.0.0.1:9050 xbps-query --cat=$page ${pkg%-*} | + SOCKS_PROXY=socks5://127.0.0.1:9995 xbps-query --cat=$page ${pkg%-*} | mandoc -O width=205 -c | col -b | vim - -M -R \ -c 'set ft=man nomod nolist' \ diff --git a/docker/dummy_registry.sh b/docker/dummy_registry.sh new file mode 100755 index 0000000..0b65038 --- /dev/null +++ b/docker/dummy_registry.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +docker run -d -p 5000:5000 --restart=always --name registry registry:2 diff --git a/docker/redis.sh b/docker/redis.sh new file mode 100755 index 0000000..a38c1eb --- /dev/null +++ b/docker/redis.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env sh + +docker run -d -e ALLOW_EMPTY_PASSWORD=yes -p 6379:6379 -it redis:6.2-alpine # pragma: allowlist secret diff --git a/ipv6/ns_bind.sh b/ipv6/ns_bind.sh index 9848ef4..f1638cd 100755 --- a/ipv6/ns_bind.sh +++ b/ipv6/ns_bind.sh @@ -12,8 +12,8 @@ PHONE_NS=phone_ns IF=enp0s20f0u3u3 -# sudo ip netns add ${PHONE_NS} -# sudo ip link set ${IF} netns ${PHONE_NS} +sudo ip netns add ${PHONE_NS} +sudo ip link set ${IF} netns ${PHONE_NS} sudo ip netns exec ${PHONE_NS} ip link set ${IF} up sudo ip netns exec ${PHONE_NS} ip link set dev lo up # will need to install dhclient before runnning this dummy diff --git a/k3s/k3s.service.env b/k3s/k3s.service.env new file mode 100644 index 0000000..9226ea1 --- /dev/null +++ b/k3s/k3s.service.env @@ -0,0 +1,6 @@ +HTTP_PROXY="socks5://192.168.1.103:9995" +HTTPS_PROXY="socks5://192.168.1.103:9995" +NO_PROXY="localhost,127.0.0.0/8,10.42.0.0/16,10.43.0.0/16,192.168.0.0/24" +http_proxy="socks5://192.168.1.103:9995" +https_proxy="socks5://192.168.1.103:9995" +no_proxy="localhost,127.0.0.0/8,10.42.0.0/16,10.43.0.0/16,192.168.0.0/16" diff --git a/k3s/registries.yaml b/k3s/registries.yaml new file mode 100644 index 0000000..4078980 --- /dev/null +++ b/k3s/registries.yaml @@ -0,0 +1,4 @@ +mirrors: + "192.168.1.103:5000": + endpoint: + - "http://192.168.1.103:5000" diff --git a/kubernetes/bitlbee-purple/bitlbee-data-volume.yaml b/kubernetes/bitlbee-purple/bitlbee-data-volume.yaml new file mode 100644 index 0000000..e2ed65b --- /dev/null +++ b/kubernetes/bitlbee-purple/bitlbee-data-volume.yaml @@ -0,0 +1,12 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + creationTimestamp: null + name: bitlbee-data +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 100Mi +status: {} diff --git a/kubernetes/bitlbee-purple/bitlbee-deployment.yaml b/kubernetes/bitlbee-purple/bitlbee-deployment.yaml index 642794a..a8971fa 100644 --- a/kubernetes/bitlbee-purple/bitlbee-deployment.yaml +++ b/kubernetes/bitlbee-purple/bitlbee-deployment.yaml @@ -17,16 +17,40 @@ spec: containers: - name: bitlbee-libpurple image: ezkrg/bitlbee-libpurple:debian-20220408145536 + imagePullPolicy: IfNotPresent + command: + - /usr/sbin/bitlbee + - -F + - -n + - -u + - bitlbee + - -c + - /var/lib/bitlbee/bitlbee.conf + - -d + - /bitlbee-user-data/ ports: - containerPort: 6667 - # volumeMounts: - # - name: bitlbee-libpurple-conf - # mountPath: /var/lib/bitlbee - # readOnly: true - # volumes: - # - name: bitlbee-conf - # configMap: - # name: bitlbee-config-file + volumeMounts: + - name: bitlbee-conf + mountPath: /var/lib/bitlbee/bitlbee.conf + subPath: bitlbee.conf + readOnly: true + - name: bitlbee-data + mountPath: /bitlbee-user-data/ + env: + - name: HTTPS_PROXY + value: socks5://192.168.1.103:9995 + - name: HTTP_PROXY + value: socks5://192.168.1.103:9995 + - name: NO_PROXY + value: localhost, 127.0.0.1, 10.0.0.0/24 + volumes: + - name: bitlbee-conf + configMap: + name: bitlbee-config-file + - name: bitlbee-data + persistentVolumeClaim: + claimName: bitlbee-data --- apiVersion: v1 kind: Service diff --git a/kubernetes/bitlbee-purple/bitlbee.conf b/kubernetes/bitlbee-purple/bitlbee.conf new file mode 100644 index 0000000..e230337 --- /dev/null +++ b/kubernetes/bitlbee-purple/bitlbee.conf @@ -0,0 +1,132 @@ +## BitlBee default configuration file +## +## Comments are marked like this. The rest of the file is INI-style. The +## comments should tell you enough about what all settings mean. +## + +[settings] + +## RunMode: +## +## Inetd -- Run from inetd (default) +## Daemon -- Run as a stand-alone daemon, serving all users from one process. +## This saves memory if there are more users, the downside is that when one +## user hits a crash-bug, all other users will also lose their connection. +## ForkDaemon -- Run as a stand-alone daemon, but keep all clients in separate +## child processes. This should be pretty safe and reliable to use instead +## of inetd mode. +## +##RunMode = Daemon + +## User: +## +## If BitlBee is started by root as a daemon, it can drop root privileges, +## and change to the specified user. +## +##User = bitlbee + +## DaemonPort/DaemonInterface: +## +## For daemon mode, you can specify on what interface and port the daemon +## should be listening for connections. +## +##DaemonInterface = 127.0.0.1 +DaemonPort = 6667 + +## ClientInterface: +## +## If for any reason, you want BitlBee to use a specific address/interface +## for outgoing traffic (IM connections, HTTP(S), etc.), set it here. +## +# ClientInterface = 0.0.0.0 + +## AuthMode +## +## Open -- Accept connections from anyone, use NickServ for user authentication. +## (default) +## Closed -- Require authorization (using the PASS command during login) before +## allowing the user to connect at all. +## Registered -- Only allow registered users to use this server; this disables +## the register- and the account command until the user identifies himself. +## +# AuthMode = Open +## AuthPassword +## +## Password the user should enter when logging into a closed BitlBee server. +## You can also have an MD5-encrypted password here. Format: "md5:", followed +## by a hash as generated for the attribute in a BitlBee +## XML file (for now there's no easier way to generate the hash). +## +# AuthPassword = ItllBeBitlBee ## Heh.. Our slogan. ;-) +## or +# AuthPassword = md5:gzkK0Ox/1xh+1XTsQjXxBJ571Vgl + +## OperPassword +## +## Password that unlocks access to special operator commands. +## +# OperPassword = ChangeMe! +## or +# OperPassword = md5:I0mnZbn1t4R731zzRdDN2/pK7lRX + +## HostName +## +## Normally, BitlBee gets a hostname using getsockname(). If you have a nicer +## alias for your BitlBee daemon, you can set it here and BitlBee will identify +## itself with that name instead. +## +# HostName = localhost + +## MotdFile +## +## Specify an alternative MOTD (Message Of The Day) file. Default value depends +## on the --etcdir argument to configure. +## +# MotdFile = /etc/bitlbee/motd.txt + +## ConfigDir +## +## Specify an alternative directory to store all the per-user configuration +## files. (.nicks/.accounts) +## +ConfigDir = /var/lib/bitlbee + +## Ping settings +## +## BitlBee can send PING requests to the client to check whether it's still +## alive. This is not very useful on local servers, but it does make sense +## when most clients connect to the server over a real network interface. +## (Public servers) Pinging the client will make sure lost clients are +## detected and cleaned up sooner. +## +## PING requests are sent every PingInterval seconds. If no PONG reply has + +## been received for PingTimeOut seconds, BitlBee aborts the connection. +## +## To disable the pinging, set at least one of these to 0. +## +# PingInterval = 180 +# PingTimeOut = 300 + +## Using proxy servers for outgoing connections +## +## If you're running BitlBee on a host which is behind a restrictive firewall +## and a proxy server, you can tell BitlBee to use that proxy server here. +## The setting has to be a URL, formatted like one of these examples: +## +## (Obviously, the username and password are optional) +## +## Proxy = http://john:doe@proxy.localnet.com:8080 +## Proxy = socks4://socksproxy.localnet.com +Proxy = socks5://192.168.1.103:9995 + + +[defaults] + +## Here you can override the defaults for some per-user settings. Users are +## still able to override your defaults, so this is not a way to restrict +## your users... + +## To enable private mode by default, for example: + +## private = 1 diff --git a/kubernetes/bitlbee-purple/conf/bitlbee.conf b/kubernetes/bitlbee-purple/conf/bitlbee.conf deleted file mode 100644 index 4a1540b..0000000 --- a/kubernetes/bitlbee-purple/conf/bitlbee.conf +++ /dev/null @@ -1,132 +0,0 @@ -## BitlBee default configuration file -## -## Comments are marked like this. The rest of the file is INI-style. The -## comments should tell you enough about what all settings mean. -## - -[settings] - -## RunMode: -## -## Inetd -- Run from inetd (default) -## Daemon -- Run as a stand-alone daemon, serving all users from one process. -## This saves memory if there are more users, the downside is that when one -## user hits a crash-bug, all other users will also lose their connection. -## ForkDaemon -- Run as a stand-alone daemon, but keep all clients in separate -## child processes. This should be pretty safe and reliable to use instead -## of inetd mode. -## -##RunMode = Daemon - -## User: -## -## If BitlBee is started by root as a daemon, it can drop root privileges, -## and change to the specified user. -## -##User = bitlbee - -## DaemonPort/DaemonInterface: -## -## For daemon mode, you can specify on what interface and port the daemon -## should be listening for connections. -## -##DaemonInterface = 127.0.0.1 -DaemonPort = 6667 - -## ClientInterface: -## -## If for any reason, you want BitlBee to use a specific address/interface -## for outgoing traffic (IM connections, HTTP(S), etc.), set it here. -## -# ClientInterface = 0.0.0.0 - -## AuthMode -## -## Open -- Accept connections from anyone, use NickServ for user authentication. -## (default) -## Closed -- Require authorization (using the PASS command during login) before -## allowing the user to connect at all. -## Registered -- Only allow registered users to use this server; this disables -## the register- and the account command until the user identifies himself. -## -# AuthMode = Open -## AuthPassword -## -## Password the user should enter when logging into a closed BitlBee server. -## You can also have an MD5-encrypted password here. Format: "md5:", followed -## by a hash as generated for the attribute in a BitlBee -## XML file (for now there's no easier way to generate the hash). -## -# AuthPassword = ItllBeBitlBee ## Heh.. Our slogan. ;-) -## or -# AuthPassword = md5:gzkK0Ox/1xh+1XTsQjXxBJ571Vgl - -## OperPassword -## -## Password that unlocks access to special operator commands. -## -# OperPassword = ChangeMe! -## or -# OperPassword = md5:I0mnZbn1t4R731zzRdDN2/pK7lRX - -## HostName -## -## Normally, BitlBee gets a hostname using getsockname(). If you have a nicer -## alias for your BitlBee daemon, you can set it here and BitlBee will identify -## itself with that name instead. -## -# HostName = localhost - -## MotdFile -## -## Specify an alternative MOTD (Message Of The Day) file. Default value depends -## on the --etcdir argument to configure. -## -# MotdFile = /etc/bitlbee/motd.txt - -## ConfigDir -## -## Specify an alternative directory to store all the per-user configuration -## files. (.nicks/.accounts) -## -ConfigDir = /var/lib/bitlbee - -## Ping settings -## -## BitlBee can send PING requests to the client to check whether it's still -## alive. This is not very useful on local servers, but it does make sense -## when most clients connect to the server over a real network interface. -## (Public servers) Pinging the client will make sure lost clients are -## detected and cleaned up sooner. -## -## PING requests are sent every PingInterval seconds. If no PONG reply has - -## been received for PingTimeOut seconds, BitlBee aborts the connection. -## -## To disable the pinging, set at least one of these to 0. -## -# PingInterval = 180 -# PingTimeOut = 300 - -## Using proxy servers for outgoing connections -## -## If you're running BitlBee on a host which is behind a restrictive firewall -## and a proxy server, you can tell BitlBee to use that proxy server here. -## The setting has to be a URL, formatted like one of these examples: -## -## (Obviously, the username and password are optional) -## -## Proxy = http://john:doe@proxy.localnet.com:8080 -## Proxy = socks4://socksproxy.localnet.com -## Proxy = socks5://socksproxy.localnet.com - - -[defaults] - -## Here you can override the defaults for some per-user settings. Users are -## still able to override your defaults, so this is not a way to restrict -## your users... - -## To enable private mode by default, for example: - -## private = 1 diff --git a/kubernetes/bitlbee-purple/deploy.sh b/kubernetes/bitlbee-purple/deploy.sh new file mode 100755 index 0000000..a9ee40a --- /dev/null +++ b/kubernetes/bitlbee-purple/deploy.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +kubectl create configmap bitlbee-config-file --from-file=bitlbee.conf +kubectl apply -f ./bitlbee-data-volume.yaml +kubectl apply -f ./bitlbee-deployment.yaml + +# kubectl delete pod mongodb +# kubectl delete pvc +# kubectl delete pv diff --git a/kubernetes/debug/debug-deployment.yaml b/kubernetes/debug/debug-deployment.yaml new file mode 100644 index 0000000..a11d80d --- /dev/null +++ b/kubernetes/debug/debug-deployment.yaml @@ -0,0 +1,46 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: debug + labels: + app: debug +spec: + replicas: 1 + selector: + matchLabels: + app: debug + template: + metadata: + labels: + app: debug + spec: + containers: + - name: debug + image: 192.168.1.103:5000/bullseye-slim + imagePullPolicy: IfNotPresent + command: + - tail + - -f + - /dev/null + env: + - name: HTTP_PROXY + value: socks5://192.168.1.103:9995 + - name: HTTPS_PROXY + value: socks5://192.168.1.103:9995 + - name: NO_PROXY + value: localhost, 127.0.0.1, 10.0.0.0/24 +--- +apiVersion: v1 +kind: Service +metadata: + name: debug-service +spec: + selector: + app: debug + type: LoadBalancer + ports: + - protocol: TCP + name: "7777" + port: 27777 + targetPort: 27777 + nodePort: 30777 diff --git a/qtbrowser/config.py b/qtbrowser/config.py index 15ed60e..a17c459 100644 --- a/qtbrowser/config.py +++ b/qtbrowser/config.py @@ -1,8 +1,9 @@ -from qutebrowser.config.configfiles import ConfigAPI -from qutebrowser.config.config import ConfigContainer +# pylint: disable=C0111 +from qutebrowser.config.configfiles import ConfigAPI # noqa: F401 +from qutebrowser.config.config import ConfigContainer # noqa: F401 -config: ConfigAPI = config -c: ConfigContainer = c +config: ConfigAPI = config # noqa: F821 pylint: disable=E0602,C0103 +c: ConfigContainer = c # noqa: F821 pylint: disable=E0602,C0103 config.load_autoconfig() diff --git a/terminaldweller.com/cgit/bootstrap/Dockerfile b/terminaldweller.com/cgit/bootstrap/Dockerfile index 73e757a..fe212dd 100644 --- a/terminaldweller.com/cgit/bootstrap/Dockerfile +++ b/terminaldweller.com/cgit/bootstrap/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.16 RUN apk update && apk add --no-cache git cronie busybox-initscripts -RUN rc-service crond start && rc-update add crond +# RUN rc-service crond start && rc-update add crond COPY ./bootstrap.sh /bootstrap.sh COPY ./docker-entrypoint.sh /docker-entrypoint.sh COPY ./crontab /etc/crontabs/root diff --git a/terminaldweller.com/cgit/docker-compose.yaml b/terminaldweller.com/cgit/docker-compose.yaml index 4635764..55484ed 100644 --- a/terminaldweller.com/cgit/docker-compose.yaml +++ b/terminaldweller.com/cgit/docker-compose.yaml @@ -17,7 +17,8 @@ services: image: bootstrap build: context: ./bootstrap - networks:bootstrapnet + networks: + - bootstrapnet volumes: - storage:/etc/gitrepos/ entrypoint: ["/docker-entrypoint.sh"] diff --git a/terminaldweller.com/haproxy/haproxy.cfg b/terminaldweller.com/haproxy/haproxy.cfg index d9ae9e3..6b2e93d 100644 --- a/terminaldweller.com/haproxy/haproxy.cfg +++ b/terminaldweller.com/haproxy/haproxy.cfg @@ -90,6 +90,7 @@ frontend https acl mail-host-s req.ssl_sni -i mail.terminaldweller.com acl chat-host-s req.ssl_sni -i chat.terminaldweller.com acl blog-host-s req.ssl_sni -i blog.terminaldweller.com + acl jericho-host-s req.ssl_sni -i jericho.terminaldweller.com acl api-host-s req.ssl_sni -i api.terminaldweller.com acl mila-api-host-s req.ssl_sni -i mila.terminaldweller.com acl searx-host-s req.ssl_sni -i searx.terminaldweller.com @@ -100,6 +101,7 @@ frontend https #Conditions use_backend mail-backend-s if mail-host-s #use_backend chat-backend-s if chat-host-s + use_backend jericho-backend-s if jericho-host-s use_backend blog-backend-s if blog-host-s #use_backend api-crypto-backend-s if api-host-s crypto-api-acl use_backend api-crypto-backend-s if api-host-s @@ -218,7 +220,7 @@ backend certbot-backend backend blog-backend mode http option forwardfor - server blog-host 192.99.102.52:9000 check + server blog-host 192.99.102.52:9001 check backend blog-backend-cert mode http option forwardfor @@ -229,7 +231,11 @@ backend cloud-one-cert server cloud-one-host 130.185.121.80:80 backend blog-backend-s mode tcp - option ssl-hello-chk + option tcp-check + server blog-host 192.99.102.52:9000 check +backend jericho-backend-s + mode tcp + option tcp-check server blog-host 192.99.102.52:9000 check backend mail-backend @@ -238,7 +244,7 @@ backend mail-backend server mail-host 185.126.202.69:80 backend mail-backend-s mode tcp - option ssl-hello-chk + option tcp-check server mail-host 185.126.202.69:443 check backend mail-backend-imap mode http @@ -246,7 +252,7 @@ backend mail-backend-imap server mail-host 185.126.202.69:143 check backend mail-backend-imaps mode tcp -#option ssl-hello-chk +#option tcp-check server mail-host 185.126.202.69:993 check backend mail-backend-pop3 mode http @@ -254,19 +260,19 @@ backend mail-backend-pop3 server mail-host 185.126.202.69:110 check backend mail-backend-pop3s mode tcp -#option ssl-hello-chk +#option tcp-check server mail-host 185.126.202.69:995 check backend mail-backend-smtp mode tcp -#option ssl-hello-chk +#option tcp-check server mail-host 185.126.202.69:25 check backend mail-backend-smtps mode tcp - option ssl-hello-chk + option tcp-check server mail-host 185.126.202.69:465 check backend mail-backend-submission mode tcp - option ssl-hello-chk + option tcp-check server mail-host 185.126.202.69:587 backend api-backend @@ -275,7 +281,7 @@ backend api-backend server api-host 192.99.102.52:8008 check backend api-crypto-backend-s mode tcp - option ssl-hello-chk + option tcp-check server api-host 192.99.102.52:8008 backend api-crypto-backend-cert mode http @@ -283,7 +289,7 @@ backend api-crypto-backend-cert server api-host 192.99.102.52:80 backend api-mila-backend-s mode tcp - option ssl-hello-chk + option tcp-check server api-mila-host 130.185.121.80:19019 backend api-mila-backend-cert mode http @@ -298,15 +304,15 @@ backend chat-backend-admin # server chat-host 130.185.121.80:5222 backend chat-backend-s mode tcp - option ssl-hello-chk + option tcp-check server chat-host 130.185.121.80:5443 backend chat-backend-c2s mode tcp - option ssl-hello-chk + option tcp-check server chat-host 130.185.121.80:5222 backend chat-auth-backend-s mode tcp - option ssl-hello-chk + option tcp-check server chat-host 130.185.121.80:5223 #backend chat-cert-backend # mode http @@ -320,22 +326,22 @@ backend searx-backend server searx-host 130.185.121.80:8080 backend searx-backend-s mode tcp - option ssl-hello-chk + option tcp-check server searx-host-s 130.185.121.80:8081 maxconn 10 backend cargo-backend-s mode tcp - option ssl-hello-chk + option tcp-check server cargo-host-s 130.185.121.80:7777 backend editor-backend-s mode tcp - option ssl-hello-chk + option tcp-check server cargo-host-s 192.99.102.52:7080 backend editorsave-backend-s mode tcp - option ssl-hello-chk + option tcp-check server cargo-host-s 192.99.102.52:9080 backend rssgen-backend diff --git a/tmux/date.sh b/tmux/date.sh index 9406561..f72cad0 100755 --- a/tmux/date.sh +++ b/tmux/date.sh @@ -22,8 +22,8 @@ if [ ! $? ]; then else WEATHER="#[fg=colour255 bg=colour32]"$WEATHER_INFO fi -CPU_TEMP=$(sensors | grep temp1 | head -n 1 | awk '{print $2}') -CPU_SECTION="#[fg=colour36 bg=colour16]$SEPARATOR_LEFT_BOLD#[fg=colour16 bg=colour36]$CPU_TEMP" +CPU_TEMP=$(sensors -j | jq .["\"coretemp-isa-0000\""]."\"Package id 0\"".temp1_input) +CPU_SECTION="#[fg=colour36 bg=colour16]$SEPARATOR_LEFT_BOLD#[fg=colour16 bg=colour36]$CPU_TEMP C" BATTERY=$(upower -i "$(upower -e | grep 'BAT')" | grep -E "percentage" | awk '{print $2}') echo "$CPU_SECTION#[fg=colour32 bg=colour36]\ -- cgit v1.2.3