Merge branch 'master' of gitea:FunctionalHacker/dotfiles
This commit is contained in:
commit
81a91fefb6
12 changed files with 55 additions and 90 deletions
|
@ -257,3 +257,6 @@ profiles:
|
||||||
localhost:
|
localhost:
|
||||||
include:
|
include:
|
||||||
- terminal
|
- terminal
|
||||||
|
ViiruJaTeippi:
|
||||||
|
include:
|
||||||
|
- terminal
|
||||||
|
|
1
docker/auth/.gitignore
vendored
Normal file
1
docker/auth/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
.env
|
20
docker/auth/docker-compose.yaml
Normal file
20
docker/auth/docker-compose.yaml
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
version: "2"
|
||||||
|
|
||||||
|
services:
|
||||||
|
openldap:
|
||||||
|
container_name: openldap
|
||||||
|
image: osixia/openldap:stable
|
||||||
|
environment:
|
||||||
|
- TZ=Europe/Helsinki
|
||||||
|
- LDAP_ORGANIZATION="Korhonen"
|
||||||
|
- LDAP_DOMAIN="korhonen.cc"
|
||||||
|
- LDAP_ADMIN_PASSWORD="${LDAP_ADMIN_PASSWORD}"
|
||||||
|
hostname: ldap.korhonen.cc
|
||||||
|
ports:
|
||||||
|
- 389:389
|
||||||
|
- 636:636
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- /docker/auth/openldap/ldap:/var/lib/ldap
|
||||||
|
- /docker/auth/openldap/slapd.d:/etc/ldap/slapd.d
|
||||||
|
- /etc/localtime:/etc/localtime:ro
|
|
@ -64,37 +64,9 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
- home-assistant
|
- home-assistant
|
||||||
- opentts
|
|
||||||
devices:
|
devices:
|
||||||
- "/dev/snd:/dev/snd"
|
- "/dev/snd:/dev/snd"
|
||||||
|
|
||||||
opentts:
|
|
||||||
image: synesthesiam/opentts
|
|
||||||
container_name: opentts
|
|
||||||
ports:
|
|
||||||
- 5500:5500
|
|
||||||
command: --marytts-url http://marytts:59125 --mozillatts-url http://mozillatts:5002
|
|
||||||
tty: true
|
|
||||||
networks:
|
|
||||||
- homeautomation
|
|
||||||
depends_on:
|
|
||||||
- marytts
|
|
||||||
- mozillatts
|
|
||||||
restart: unless-stopped
|
|
||||||
marytts:
|
|
||||||
image: synesthesiam/marytts:5.2
|
|
||||||
container_name: marytts
|
|
||||||
restart: unless-stopped
|
|
||||||
tty: true
|
|
||||||
networks:
|
|
||||||
- homeautomation
|
|
||||||
mozillatts:
|
|
||||||
image: synesthesiam/mozilla-tts
|
|
||||||
container_name: mozillatts
|
|
||||||
tty: true
|
|
||||||
networks:
|
|
||||||
- homeautomation
|
|
||||||
|
|
||||||
node-red:
|
node-red:
|
||||||
container_name: node-red
|
container_name: node-red
|
||||||
image: nodered/node-red
|
image: nodered/node-red
|
||||||
|
|
|
@ -17,9 +17,10 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
- /docker/traefik/traefik.yml:/traefik.yml:ro
|
- /docker/træfik/træfik/traefik.yml:/traefik.yml:ro
|
||||||
- /docker/traefik/dashboard-users:/dashboard-users:ro
|
- /docker/træfik/træfik/dashboard-users:/dashboard-users:ro
|
||||||
- /docker/traefik/acme.json:/acme.json
|
- /docker/træfik/træfik/acme.json:/acme.json
|
||||||
|
- /docker/træfik/træfik/log:/var/log
|
||||||
labels:
|
labels:
|
||||||
- 'traefik.enable=true'
|
- 'traefik.enable=true'
|
||||||
|
|
||||||
|
@ -36,6 +37,17 @@ services:
|
||||||
- 'traefik.http.routers.dashboard.tls.certresolver=http'
|
- 'traefik.http.routers.dashboard.tls.certresolver=http'
|
||||||
- 'traefik.http.routers.dashboard.service=api@internal'
|
- 'traefik.http.routers.dashboard.service=api@internal'
|
||||||
|
|
||||||
|
fail2ban:
|
||||||
|
image: crazymax/fail2ban:latest
|
||||||
|
container_name: fail2ban
|
||||||
|
restart: unless-stopped
|
||||||
|
network_mode: "host"
|
||||||
|
cap_add:
|
||||||
|
- NET_ADMIN
|
||||||
|
- NET_RAW
|
||||||
|
volumes:
|
||||||
|
- /docker/træfik/træfik/log:/var/log/træfik:ro
|
||||||
|
- /docker/træfik/fail2ban:/data
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
|
@ -1,54 +0,0 @@
|
||||||
version: "3.3"
|
|
||||||
|
|
||||||
services:
|
|
||||||
wordpress:
|
|
||||||
container_name: wordpress
|
|
||||||
image: wordpress:latest
|
|
||||||
environment:
|
|
||||||
- TZ=Europe/Helsinki
|
|
||||||
- WORDPRESS_DB_HOST=mariadb-wordpress:3306
|
|
||||||
- WORDPRESS_DB_USER=wordpress
|
|
||||||
- WORDPRESS_DB_PASSWORD=wordpress
|
|
||||||
- WORDPRESS_DB_NAME=wordpress
|
|
||||||
restart: unless-stopped
|
|
||||||
networks:
|
|
||||||
- proxy
|
|
||||||
- wordpress
|
|
||||||
volumes:
|
|
||||||
- /docker/wordpress/wordpress:/var/www/html
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
labels:
|
|
||||||
- "traefik.enable=true"
|
|
||||||
|
|
||||||
- "traefik.http.routers.wordpress-redirect.entrypoints=http"
|
|
||||||
- "traefik.http.routers.wordpress-redirect.rule=Host(`johanna.korhonen.cc`)"
|
|
||||||
- "traefik.http.middlewares.http2https.redirectscheme.scheme=https"
|
|
||||||
- "traefik.http.routers.wordpress-redirect.middlewares=http2https"
|
|
||||||
|
|
||||||
- "traefik.http.routers.wordpress.entrypoints=https"
|
|
||||||
- "traefik.http.routers.wordpress.rule=Host(`johanna.korhonen.cc`)"
|
|
||||||
- "traefik.http.routers.wordpress.tls=true"
|
|
||||||
- "traefik.http.routers.wordpress.tls.certresolver=http"
|
|
||||||
- "traefik.http.routers.wordpress.service=wordpress"
|
|
||||||
- "traefik.docker.network=proxy"
|
|
||||||
- "traefik.http.services.wordpress.loadbalancer.server.port=80"
|
|
||||||
|
|
||||||
mariadb-wordpress:
|
|
||||||
image: mariadb
|
|
||||||
container_name: mariadb-wordpress
|
|
||||||
volumes:
|
|
||||||
- /docker/wordpress/mariadb:/var/lib/mysql
|
|
||||||
restart: always
|
|
||||||
networks:
|
|
||||||
- wordpress
|
|
||||||
environment:
|
|
||||||
- MYSQL_ROOT_PASSWORD=oT8Veu3Vre4ohj3E
|
|
||||||
- MYSQL_DATABASE=wordpress
|
|
||||||
- MYSQL_USER=wordpress
|
|
||||||
- MYSQL_PASSWORD=wordpress
|
|
||||||
|
|
||||||
networks:
|
|
||||||
proxy:
|
|
||||||
external: true
|
|
||||||
wordpress:
|
|
||||||
external: false
|
|
2
dotdrop
2
dotdrop
|
@ -1 +1 @@
|
||||||
Subproject commit 636c1ade26a5205ca84aef624ed971c0e529ffa7
|
Subproject commit 5d4b12eaf44b940ba3a478ded48b1cde039471a6
|
|
@ -17,7 +17,10 @@ mpvqueue %U
|
||||||
^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv)
|
^https?://(?:[a-z0-9\-]+\.)+[a-z]{2,6}(?:/[^/#?]+)+\.(?:mp4|mkv|webm|avi|3gp|gif|gifv)
|
||||||
|
|
||||||
mpvqueue %U
|
mpvqueue %U
|
||||||
^https?://www.facebook.com/.*/videos/
|
^https://www.facebook.com/watch/?v=.*
|
||||||
|
|
||||||
|
mpvqueue %U
|
||||||
|
^https://fb.watch/.*
|
||||||
|
|
||||||
mpvqueue %U
|
mpvqueue %U
|
||||||
^https?://gfycat.com/.*
|
^https?://gfycat.com/.*
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
PACKAGER="Marko Korhonen <marko@korhonen.cc>"
|
||||||
DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
|
DLAGENTS=('file::/usr/bin/curl -gqC - -o %o %u'
|
||||||
'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
|
'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
|
||||||
'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u'
|
||||||
|
@ -15,8 +16,9 @@ CARCH="x86_64"
|
||||||
CHOST="x86_64-pc-linux-gnu"
|
CHOST="x86_64-pc-linux-gnu"
|
||||||
|
|
||||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
||||||
CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
CFLAGS="-march=native -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
||||||
CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector-strong -fno-plt"
|
CXXFLAGS="${CFLAGS}"
|
||||||
|
RUSTFLAGS="-C opt-level=3 -C target-cpu=native"
|
||||||
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
|
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
|
||||||
MAKEFLAGS="-j$(nproc)"
|
MAKEFLAGS="-j$(nproc)"
|
||||||
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
|
DEBUG_CFLAGS="-g -fvar-tracking-assignments"
|
||||||
|
|
|
@ -15,6 +15,7 @@ exec {
|
||||||
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
|
||||||
mpDris2
|
mpDris2
|
||||||
swaymsg workspace 1
|
swaymsg workspace 1
|
||||||
|
dbus-update-activation-environment DISPLAY
|
||||||
}
|
}
|
||||||
|
|
||||||
exec_always {
|
exec_always {
|
||||||
|
|
|
@ -39,7 +39,7 @@ export AUR_PAGER=$PAGER
|
||||||
export GPG_TTY="$(tty)"
|
export GPG_TTY="$(tty)"
|
||||||
|
|
||||||
# set SSH_AUTH_SOCK if not logging in over SSH
|
# set SSH_AUTH_SOCK if not logging in over SSH
|
||||||
if [ "$SSH_CONNECTION" != "" ]; then
|
if [ "$SSH_CONNECTION" -eq "" ]; then
|
||||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||||
gpgconf --launch gpg-agent
|
gpgconf --launch gpg-agent
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -40,3 +40,8 @@ host takamaki
|
||||||
HostName 10.200.200.5
|
HostName 10.200.200.5
|
||||||
port 22
|
port 22
|
||||||
user reekymarko
|
user reekymarko
|
||||||
|
|
||||||
|
host viirujateippi
|
||||||
|
HostName viirujateippi.fi
|
||||||
|
port 22
|
||||||
|
user functionalhacker
|
||||||
|
|
Loading…
Reference in a new issue