Compare commits

...

8 Commits

Author SHA1 Message Date
9c9938bc55 Sync changes
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 22:40:39 +02:00
33785901fc Update readme
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 22:12:25 +02:00
ca1eaf9787 Clean old cache
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 22:10:16 +02:00
f25a6fdb32 Fix OpenSSH perm issues
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 22:09:00 +02:00
fb8d683f9f SSH can be root
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 20:28:15 +02:00
8885463196 Revert to mariaDB database instead linuxserver/mariadb
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 19:51:22 +02:00
7d6d59a4ab Update config
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 19:22:18 +02:00
68c23b1b0f Update ressources path
Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
2024-09-16 19:22:00 +02:00
15 changed files with 73 additions and 50 deletions

View File

@ -26,13 +26,13 @@ If you have any **questions** or **suggestions**, feel free to open an issue or
## Architecture
![Architecture](resources/arch_infra.png)
![Architecture](ressources/arch_infra.png)
## Screenshots
The homepage is a dashboard with many widgets and services.
![Homepage](resources/homepagev1.jpg)
![Homepage](ressources/homepagev1.jpg)
## Installation and configuration
@ -124,9 +124,9 @@ WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
For [wordpress_db.env](infrastructure/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database.
```sh
MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
```
For [wordpress_backup.env](infrastructure/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup.
@ -137,9 +137,9 @@ RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
For [adminer.env](infrastructure/wordpress/env/adminer.env) file, you need to change the password(s) and user for the database.
```sh
MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
```
For [gitea.env](infrastructure/gitea/env/gitea.env) file, you need to change the password(s) and user for the database.
@ -153,9 +153,9 @@ GITEA__security__SECRET_KEY=ykcZt23an1E4lFHWvrCKdAyt16WAiK9c
For [gitea_db.env](infrastructure/gitea/env/gitea_db.env) file, you need to change the password(s) and user for the database.
```sh
MYSQL_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
```
For [psitransfer.env](infrastructure/psitransfer/env/psitransfer.env) file, you need to change the secret key.
@ -173,9 +173,9 @@ SECRET_KEY=UZvg9nbcGIJlPEB3uI39TAEWyFOz9nm8
For [projectsend_db.env](infrastructure/projectsend/env/projectsend_db.env) file, you need to change the password(s) and user for the database.
```sh
MYSQL_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
```
For [picoshare.env](infrastructure/picoshare/env/picoshare.env) file, you need to change the secret key.
@ -202,10 +202,18 @@ SECURITY_INITIALLOGIN_USERNAME=admin
SECURITY_INITIALLOGIN_PASSWORD=Jw9U039f5xc2mFcacvGvPD9RjwIh4DzO
```
You can need to add/change the public ssh key [id_ed25519.pub](infrastructure/openssh/config/authorized_keys/id_ed25519.pub) (its my public key), also change the user name in [openssh.env](infrastructure/openssh/env/openssh.env):
You can need to add/change the public ssh key [id_ed25519.pub](infrastructure/openssh/config/authorized_keys/id_ed25519.pub) (its my public key), also change the config/password in [openssh.env](infrastructure/openssh/env/openssh.env):
```sh
USER_NAME=bensuperpc
SUDO_ACCESS=true
#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
PUBLIC_KEY_DIR=/authorized_ssh_keys
USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
#PUBLIC_KEY=yourpublickey
#PUBLIC_KEY_FILE=/path/to/file
#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
#USER_PASSWORD_FILE=/path/to/file
```
### Start the infrastructure
@ -254,6 +262,12 @@ This infrastructure uses docker volumes to store data, all configuration/data fo
The default port for ssh/rsync is is 2222.
You can access to the server with:
```sh
ssh -p 2222 admin@bensuperpc.org
```
## Sources
- [Wordpress](https://wordpress.org/)

View File

@ -21,6 +21,7 @@ services:
- infra-network
env_file:
- ./caddy/env/caddy.env
#read_only: true
security_opt:
- no-new-privileges:true
#cap_drop:

View File

@ -25,21 +25,19 @@ services:
# Database gitea
database_gitea:
image: lscr.io/linuxserver/mariadb:latest
image: mariadb:latest
container_name: database_gitea
profiles:
- database
- gitea
depends_on:
- caddy
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
restart: on-failure:5
volumes:
- gitea_db:/var/lib/mysql:rw
env_file:
- ./gitea/env/gitea_db.env
command: '--default-authentication-plugin=mysql_native_password'
networks:
- infra-network
security_opt:

View File

@ -1,4 +1,4 @@
MYSQL_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
MYSQL_DATABASE=gitea
MARIADB_ROOT_PASSWORD=xpc4zIhHZzWKqVHcjBu4aW6aS7jG8d7X
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=K7s5yoHknnEd7vsZoxb8I3dK9mjToF1j
MARIADB_DATABASE=gitea

View File

@ -15,6 +15,11 @@ services:
- ./homepage/config:/app/config:ro
- ./homepage/image:/app/public/image:ro
- /var/run/docker.sock:/var/run/docker.sock:ro
# develop:
# watch:
# - action: sync+restart
# path: ./homepage/image
# target: /app/public/image
networks:
- infra-network
security_opt:

View File

@ -14,14 +14,17 @@ services:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
volumes:
- openssh_config:/config
- public_data:/public
- private_data:/private
- openssh_config:/config:rw
- ./openssh/config/authorized_keys:/authorized_ssh_keys:ro
- public_data:/public:rw
- private_data:/private:rw
- caddy_data:/caddy_data:rw
- caddy_config:/caddy_config:rw
- caddy_backup:/caddy_backup:rw
networks:
- infra-network
security_opt:
- no-new-privileges:true
- no-new-privileges:false
ports:
- 2222:2222
volumes:
@ -31,3 +34,9 @@ volumes:
name: public_data
private_data:
name: private_data
caddy_data:
name: caddy_data
caddy_config:
name: caddy_config
caddy_backup:
name: caddy_backup

View File

@ -1,15 +1,15 @@
TZ=Etc/UTC
SUDO_ACCESS=false
SUDO_ACCESS=true
PASSWORD_ACCESS=false
DOCKER_MODS=linuxserver/mods:openssh-server-rsync
#PUBLIC_KEY_URL=https://github.com/bensuperpc.keys
PUBLIC_KEY_DIR=/authorized_ssh_keys
USER_NAME=bensuperpc
USER_NAME=admin
USER_PASSWORD=rdUwf36C11PLmpU9Lvq7tP5pfFBKAuCh
#PUBLIC_KEY=yourpublickey
#PUBLIC_KEY_FILE=/path/to/file
#PUBLIC_KEY_DIR=/path/to/directory/containing/_only_/pubkeys
#PUBLIC_KEY_URL=https://github.com/username.keys
#USER_PASSWORD=password
#USER_PASSWORD_FILE=/path/to/file
#LOG_STDOUT=

View File

@ -21,7 +21,7 @@ services:
# Database projectsend
projectsend_db:
image: lscr.io/linuxserver/mariadb:latest
image: mariadb:latest
container_name: projectsend_db
profiles:
- database
@ -33,9 +33,7 @@ services:
- projectsend_db:/var/lib/mysql:rw
env_file:
- ./projectsend/env/projectsend_db.env
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
command: '--default-authentication-plugin=mysql_native_password'
networks:
- infra-network
security_opt:

View File

@ -1,4 +1,4 @@
MYSQL_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
MYSQL_DATABASE=projectsend
MARIADB_ROOT_PASSWORD=8O34297GrBfT3Ld34Lfg9mpotmZwbJtt
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=wdSUa1JEZhXie5AJ5NcX1w73xmpO12EY
MARIADB_DATABASE=projectsend

View File

@ -21,21 +21,19 @@ services:
# Database wordpress
wordpress_db:
image: lscr.io/linuxserver/mariadb:latest
image: mariadb:latest
container_name: wordpress_db
profiles:
- database
- wordpress
depends_on:
- caddy
environment:
- PUID=${PUID:-1000}
- PGID=${PGID:-1000}
restart: on-failure:5
volumes:
- wordpress_db:/var/lib/mysql:rw
env_file:
- ./wordpress/env/wordpress_db.env
command: '--default-authentication-plugin=mysql_native_password'
networks:
- infra-network
security_opt:

View File

@ -1,4 +1,4 @@
MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
ADMINER_DEFAULT_SERVER=wordpress_db

View File

@ -1,4 +1,4 @@
MYSQL_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MYSQL_USER=bensuperpc
MYSQL_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
MYSQL_DATABASE=wordpress
MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ
MARIADB_USER=bensuperpc
MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw
MARIADB_DATABASE=wordpress

View File

Before

Width:  |  Height:  |  Size: 338 KiB

After

Width:  |  Height:  |  Size: 338 KiB

View File

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 108 KiB