aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Yann Autissier
2022-11-27 02:33:21 +00:00
committed by Boris
parent c6a5e9cb00
commit 2b20a33133
40 changed files with 564 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stack/User.mk
-1
View File
@@ -2,7 +2,6 @@ CMDARGS += user-exec user-exec:% user-exec@% user-run us
ENV_VARS += USER_DOMAIN user_domain
USER_DOMAIN ?= $(USER).$(DOMAIN)
User ?= $(patsubst stack/%,%,$(patsubst %.yml,%,$(wildcard stack/User/*.yml)))
user_domain ?= $(user).$(domain)
# target start-stack-User: Fire ssh-add
.PHONY: start-stack-User
stack/User/.env.dist
-6
View File
@@ -1,6 +0,0 @@
USER_MYOS_RC_PROMPT_SET=true
USER_MYOS_RC_PS1_SET=true
USER_MYOS_RC_SCREEN_ATTACH=true
USER_MYOS_RC_SOURCE=/etc/profile.d/rc_functions.sh
USER_MYOS_RC_SSH_ADD=true
USER_MYOS_RC_TMUX_ATTACH=false
stack/User/User.yml
+6 -6
View File
@@ -20,12 +20,12 @@ services:
container_name: ${USER_DOCKER_NAME}
environment:
- ENV=${ENV}
- RC_00_SOURCE=${USER_MYOS_RC_SOURCE}
- RC_01_PS1_SET=${USER_MYOS_RC_PS1_SET}
- RC_02_PROMPT_SET=${USER_MYOS_RC_PROMPT_SET}
- RC_03_SSH_ADD=${USER_MYOS_RC_SSH_ADD}
- RC_04_TMUX_ATTACH=${USER_MYOS_RC_TMUX_ATTACH}
- RC_05_SCREEN_ATTACH=${USER_MYOS_RC_SCREEN_ATTACH}
- RC_00_SOURCE=${USER_RC_SOURCE:-/etc/profile.d/rc_functions.sh}
- RC_01_PS1_SET=${USER_RC_PS1_SET:-true}
- RC_02_PROMPT_SET=${USER_RC_PROMPT_SET:-true}
- RC_03_SSH_ADD=${USER_RC_SSH_ADD:-true}
- RC_04_TMUX_ATTACH=${USER_RC_TMUX_ATTACH:-false}
- RC_05_SCREEN_ATTACH=${USER_RC_SCREEN_ATTACH:-true}
- SHELL=${DOCKER_SHELL}
image: ${USER_DOCKER_IMAGE}
networks:
stack/User/ipfs.mk
+3 -3
View File
@@ -1,4 +1,4 @@
ENV_VARS += USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN USER_IPFS_SERVICE_5001_TAGS USER_IPFS_SERVICE_8080_TAGS
USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN ?= ["https://ipfs.$(USER_DOMAIN)", "http://ipfs.localhost:8080"]
USER_IPFS_SERVICE_5001_TAGS ?= urlprefix-ipfs.$(USER_DOMAIN)/user/$(user_domain)/api
USER_IPFS_SERVICE_8080_TAGS ?= urlprefix-ipfs.$(USER_DOMAIN)/user/$(user_domain),urlprefix-*.ipfs.$(USER_DOMAIN)/user/$(user_domain),urlprefix-ipns.$(USER_DOMAIN)/user/$(user_domain),urlprefix-*.ipns.$(USER_DOMAIN)/user/$(user_domain)
USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN ?= ["https://ipfs.$(user_domain).$(DOMAIN)"]
USER_IPFS_SERVICE_5001_TAGS ?= urlprefix-ipfs.$(user_domain).$(DOMAIN)/api/
USER_IPFS_SERVICE_8080_TAGS ?= urlprefix-ipfs.$(user_domain).$(DOMAIN)/
stack/User/ipfs.yml
+1
View File
@@ -90,6 +90,7 @@ services:
volumes:
ipfs:
name: ${USER_DOCKER_VOLUME}_ipfs
networks:
private:
stack/node/.env.dist
-9
View File
@@ -1,9 +0,0 @@
NODE_CONSUL_ACL_TOKENS_MASTER=01234567-89AB-CDEF-0123-456789ABCDEF
NODE_CONSUL_HTTP_TOKEN=01234567-89AB-CDEF-0123-456789ABCDEF
NODE_CONSUL_SERVICE_8500_TAGS=urlprefix-consul.${DOMAIN}/
NODE_FABIO_SERVICE_9998_TAGS=urlprefix-fabio.${DOMAIN}/
NODE_SSH_PORT=${SSH_PORT}
NODE_SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS}
UFW_UPDATE_certbot=53/udp
UFW_UPDATE_consul=8500
UFW_DOCKER_fabio=80 443
stack/node/backup/.env.dist
-2
View File
@@ -1,2 +0,0 @@
NODE_RESTIC_REPOSITORY=
NODE_RESTIC_PASSWORD=
stack/node/backup/restic.yml
+4 -10
View File
@@ -8,12 +8,10 @@ services:
BACKUP_CRON: "30 3 * * *"
RESTIC_REPOSITORY: ${NODE_RESTIC_REPOSITORY}
RESTIC_PASSWORD: ${NODE_RESTIC_PASSWORD}
RESTIC_BACKUP_SOURCES: /var/lib/docker/volumes
RESTIC_BACKUP_TAGS: docker-volumes
RESTIC_FORGET_ARGS: --prune --keep-last 14 --keep-daily 1
TZ: Europe/Paris
networks:
- private
RESTIC_BACKUP_SOURCES: ${NODE_RESTIC_BACKUP_SOURCES:-/var/lib/docker/volumes}
RESTIC_BACKUP_TAGS: ${NODE_RESTIC_BACKUP_TAGS:-docker-volumes}
RESTIC_FORGET_ARGS: ${NODE_RESTIC_FORGET_ARGS:---prune --keep-last 14 --keep-daily 1}
TZ: ${NODE_TZ:-${TZ}}
volumes:
- restic:/root/.config
- /var/lib/docker/volumes:/var/lib/docker/volumes:ro
@@ -21,7 +19,3 @@ services:
volumes:
restic:
networks:
private:
external: true
name: ${DOCKER_NETWORK_PRIVATE}
stack/node/certbot.mk
+1
View File
@@ -0,0 +1 @@
NODE_CERTBOT_UFW_UPDATE ?= 53/udp
stack/node/consul.mk
+5
View File
@@ -0,0 +1,5 @@
ENV_VARS += NODE_CONSUL_ACL_TOKENS_MASTER NODE_CONSUL_HTTP_TOKEN NODE_CONSUL_SERVICE_8500_TAGS
NODE_CONSUL_ACL_TOKENS_MASTER ?= 01234567-89ab-cdef-0123-456789abcdef
NODE_CONSUL_HTTP_TOKEN ?= $(NODE_CONSUL_ACL_TOKENS_MASTER)
NODE_CONSUL_SERVICE_8500_TAGS ?= urlprefix-consul.${DOMAIN}/
NODE_CONSUL_UFW_UPDATE ?= 8500
stack/node/exporter.mk
+3
View File
@@ -0,0 +1,3 @@
ENV_VARS += NODE_EXPORTER_CADVISOR_SERVICE_8080_TAGS NODE_EXPORTER_NODE_SERVICE_9100_TAGS
NODE_EXPORTER_CADVISOR_SERVICE_8080_TAGS ?= urlprefix-cadvisor-exporter.${DOMAIN}/
NODE_EXPORTER_NODE_SERVICE_9100_TAGS ?= urlprefix-node-exporter.${DOMAIN}/
stack/node/exporter/.env.dist
-2
View File
@@ -1,2 +0,0 @@
NODE_EXPORTER_CADVISOR_SERVICE_8080_TAGS=urlprefix-exporter-cadvisor.${DOMAIN}/
NODE_EXPORTER_NODE_SERVICE_9100_TAGS=urlprefix-exporter-node.${DOMAIN}/
stack/node/fabio.mk
+3
View File
@@ -0,0 +1,3 @@
ENV_VARS += NODE_FABIO_SERVICE_9998_TAGS
NODE_FABIO_SERVICE_9998_TAGS ?= urlprefix-fabio.${DOMAIN}/
NODE_FABIO_UFW_UPDATE ?= 80/tcp 443/tcp
stack/node/mail.mk
+6
View File
@@ -0,0 +1,6 @@
# ENV_VARS += NODE_MAILSERVER_ENABLE_MANAGESIEVE NODE_MAILSERVER_SPOOF_PROTECTION NODE_MAILSERVER_SSL_TYPE NODE_MAILSERVER_ENABLE_UPDATE_CHECK
NODE_MAILSERVER_ENABLE_MANAGESIEVE ?= 1
NODE_MAILSERVER_SPOOF_PROTECTION ?= 1
NODE_MAILSERVER_SSL_TYPE ?= letsencrypt
NODE_MAILSERVER_ENABLE_UPDATE_CHECK ?= 0
NODE_MAILSERVER_UFW_DOCKER ?= 25/tcp 465/tcp 587/tcp 993/tcp
stack/node/mail/.env.dist
-5
View File
@@ -1,5 +0,0 @@
NODE_MAILSERVER_ENABLE_MANAGESIEVE=1
NODE_MAILSERVER_SPOOF_PROTECTION=1
NODE_MAILSERVER_SSL_TYPE=letsencrypt
NODE_MAILSERVER_UPDATE_CHECK=0
UFW_DOCKER_mailserver=25 465 587 993
stack/node/mail/mailserver.yml
+5 -5
View File
@@ -15,13 +15,13 @@ services:
- ONE_DIR=${NODE_MAILSERVER_ONE_DIR:-1}
- ACCOUNT_PROVISIONER=${NODE_MAILSERVER_ACCOUNT_PROVISIONER:-}
- POSTMASTER_ADDRESS=${NODE_MAILSERVER_POSTMASTER_ADDRESS:-}
- ENABLE_UPDATE_CHECK=${NODE_MAILSERVER_ENABLE_UPDATE_CHECK:-1}
- ENABLE_UPDATE_CHECK=${NODE_MAILSERVER_ENABLE_UPDATE_CHECK:-0}
- UPDATE_CHECK_INTERVAL=${NODE_MAILSERVER_UPDATE_CHECK_INTERVAL:-1d}
- PERMIT_DOCKER=${NODE_MAILSERVER_PERMIT_DOCKER:-none}
- TZ=${NODE_MAILSERVER_TZ:-}
- TZ=${NODE_MAILSERVER_TZ:-${TZ}}
- NETWORK_INTERFACE=${NODE_MAILSERVER_NETWORK_INTERFACE:-}
- TLS_LEVEL=${NODE_MAILSERVER_TLS_LEVEL:-}
- SPOOF_PROTECTION=${NODE_MAILSERVER_SPOOF_PROTECTION:-}
- SPOOF_PROTECTION=${NODE_MAILSERVER_SPOOF_PROTECTION:-1}
- ENABLE_SRS=${NODE_MAILSERVER_ENABLE_SRS:-0}
- ENABLE_POP3=${NODE_MAILSERVER_ENABLE_POP3:-}
- ENABLE_CLAMAV=${NODE_MAILSERVER_ENABLE_CLAMAV:-0}
@@ -30,10 +30,10 @@ services:
- ENABLE_DNSBL=${NODE_MAILSERVER_ENABLE_DNSBL:-0}
- ENABLE_FAIL2BAN=${NODE_MAILSERVER_ENABLE_FAIL2BAN:-0}
- FAIL2BAN_BLOCKTYPE=${NODE_MAILSERVER_FAIL2BAN_BLOCKTYPE:-drop}
- ENABLE_MANAGESIEVE=${NODE_MAILSERVER_ENABLE_MANAGESIEVE:-}
- ENABLE_MANAGESIEVE=${NODE_MAILSERVER_ENABLE_MANAGESIEVE:-1}
- POSTSCREEN_ACTION=${NODE_MAILSERVER_POSTSCREEN_ACTION:-enforce}
- SMTP_ONLY=${NODE_MAILSERVER_SMTP_ONLY:-}
- SSL_TYPE=${NODE_MAILSERVER_SSL_TYPE:-}
- SSL_TYPE=${NODE_MAILSERVER_SSL_TYPE:-letsencrypt}
- SSL_CERT_PATH=${NODE_MAILSERVER_SSL_CERT_PATH:-}
- SSL_KEY_PATH=${NODE_MAILSERVER_SSL_KEY_PATH:-}
- SSL_ALT_CERT_PATH=${NODE_MAILSERVER_SSL_ALT_CERT_PATH:-}
stack/node/portainer.mk
+2
View File
@@ -0,0 +1,2 @@
ENV_VARS += NODE_PORTAINER_SERVICE_9000_TAGS
NODE_PORTAINER_SERVICE_9000_TAGS ?= urlprefix-portainer.${DOMAIN}/
stack/node/portainer/portainer.yml → stack/node/portainer.yml
View File
stack/node/portainer/.env.dist
-1
View File
@@ -1 +0,0 @@
NODE_PORTAINER_SERVICE_9000_TAGS=urlprefix-portainer.${DOMAIN}/
stack/node/vdi/.env.dist
-7
View File
@@ -1,7 +0,0 @@
NODE_VDI_ECRYPTERS=${USER}
NODE_VDI_LANG=${LANG}
NODE_VDI_PORT=${SSH_PORT}
NODE_VDI_SUDOERS=
NODE_VDI_TZ=UTC
NODE_VDI_USERS=${USER}
UFW_DOCKER_vdi=${SSH_PORT}
stack/node/vdi/vdi.yml
+7 -7
View File
@@ -5,7 +5,7 @@ services:
build:
args:
- DOCKER_BUILD_DIR=docker/x2go/xfce-debian
- SSH_PORT=${NODE_VDI_PORT:-22}
- SSH_PORT=${NODE_SSH_PORT:-${SSH_PORT}}
context: ../..
dockerfile: docker/x2go/xfce-debian/Dockerfile
cap_add:
@@ -17,14 +17,14 @@ services:
cpus: 0.5
environment:
- DEBUG=${VDI_DEBUG:-}
- ECRYPTERS=${NODE_VDI_ECRYPTERS:-}
- LANG=${NODE_VDI_LANG:-}
- SSH_PORT=${NODE_VDI_PORT:-22}
- ECRYPTERS=${NODE_VDI_ECRYPTERS:-${USER}}
- LANG=${NODE_VDI_LANG:-C.UTF-8}
- SSH_PORT=${NODE_SSH_PORT:-${SSH_PORT}}
- SSH_AUTHORIZED_KEYS=${SSH_AUTHORIZED_KEYS:-}
- SSH_PUBLIC_HOSTS=${NODE_SSH_PUBLIC_HOSTS:-}
- SUDOERS=${NODE_VDI_SUDOERS:-}
- SSH_PUBLIC_HOSTS=${NODE_SSH_PUBLIC_HOSTS:-${SSH_PUBLIC_HOSTS}}
- SUDOERS=${NODE_VDI_SUDOERS:-${USER}}
- TZ=${NODE_VDI_TZ:-}
- USERS=${NODE_VDI_USERS:-}
- USERS=${NODE_VDI_USERS:-${USER}}
image: ${NODE_DOCKER_REPOSITORY}/vdi:${DOCKER_IMAGE_TAG}
networks:
- public
stack/node/vsftpd/.env.dist
-3
View File
@@ -1,3 +0,0 @@
NODE_VSFTPD_S3_AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
NODE_VSFTPD_S3_AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
NODE_VSFTPD_S3_FTPD_USERS=ftpuser::ftppass::ftpbucket
stack/node/vsftpd/s3.yml
+2 -2
View File
@@ -13,8 +13,8 @@ services:
devices:
- /dev/fuse
environment:
- AWS_ACCESS_KEY_ID=${NODE_VSFTPD_S3_AWS_ACCESS_KEY_ID}
- AWS_SECRET_ACCESS_KEY=${NODE_VSFTPD_S3_AWS_SECRET_ACCESS_KEY}
- AWS_ACCESS_KEY_ID=${NODE_VSFTPD_S3_AWS_ACCESS_KEY_ID:-${AWS_ACCESS_KEY_ID}}
- AWS_SECRET_ACCESS_KEY=${NODE_VSFTPD_S3_AWS_SECRET_ACCESS_KEY:-${AWS_SECRET_ACCESS_KEY}}
- DIR_REMOTE=${NODE_VSFTPD_S3_DIR_REMOTE}
- FTP_HOST=${NODE_VSFTPD_S3_FTP_HOST}
- FTP_PASS=${NODE_VSFTPD_S3_FTP_PASS}
stack/x2go/.env.dist
-6
View File
@@ -1,6 +0,0 @@
VDI_ECRYPTERS=
VDI_LANG=${LANG}
VDI_PORT=8260
VDI_SUDOERS=
VDI_TZ=UTC
VDI_USERS=${USER}
stack/x2go/vdi.mk
+4
View File
@@ -0,0 +1,4 @@
VDI_LANG ?= C.UTF-8
VDI_PORT ?= 123
VDI_TZ ?= UTC
VDI_USERS ?= $(USER)
stack/x2go/xfce_debian.yml → stack/x2go/vdi.yml
+4 -3
View File
@@ -5,7 +5,8 @@ services:
build:
args:
- DOCKER_BUILD_DIR=docker/x2go/xfce-debian
- SSH_PORT=${VDI_PORT:-22}
- DOCKER_GID=${DOCKER_GID:-}
- SSH_PORT=${SSH_PORT:-22}
context: ../..
dockerfile: docker/x2go/xfce-debian/Dockerfile
cap_add:
@@ -18,7 +19,7 @@ services:
- DEBUG=${VDI_DEBUG:-}
- ECRYPTERS=${VDI_ECRYPTERS:-}
- LANG=${VDI_LANG:-}
- SSH_PORT=${VDI_PORT:-22}
- SSH_PORT=${SSH_PORT:-22}
- SSH_PUBLIC_HOSTS=${SSH_PUBLIC_HOSTS:-}
- SUDOERS=${VDI_SUDOERS:-}
- TZ=${VDI_TZ:-}
@@ -28,7 +29,7 @@ services:
- private
- public
ports:
- ${SSH_PORT}
- ${VDI_PORT}:${SSH_PORT}
restart: unless-stopped
security_opt:
- apparmor=unconfined # ecryptfs