diff --git a/Makefile b/Makefile index 1c333a8..a6cc1ed 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ BLOG_SERVICES := wordpress TORRENTS_SERVICES := qbittorrent transmission SHARING_SERVICES := psitransfer picoshare privatebin projectsend jellyfin dufs gitea syncthing -ADMIN_SERVICES := yacht uptime-kuma adminer openssh +ADMIN_SERVICES := yacht uptime-kuma openssh UTILS_SERVICES := it-tools stirlingpdf # gitea-runner diff --git a/README.md b/README.md index c887b24..f3a9cfd 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,6 @@ And then, caddy will generate the certificate for you and renew it automatically | [bensuperpc.org](https://bensuperpc.org) | Main | Redirect to www.bensuperpc.org | | [www.bensuperpc.org](https://www.bensuperpc.org) | Main | Homepage | | [wordpress.bensuperpc.org](https://wordpress.bensuperpc.org) | Sub | Wordpress website | -| [adminer.bensuperpc.org](https://adminer.bensuperpc.org) | Sub | Adminer for MariaDB for wordpress only | | [uptimekuma.bensuperpc.org](https://uptimekuma.bensuperpc.org) | Sub | Uptime Kuma for monitoring | | [qbittorrent.bensuperpc.org](https://qbittorrent.bensuperpc.org) | Sub | Torrent client/server | | [transmission.bensuperpc.org](https://transmission.bensuperpc.org) | Sub | Torrent client/server | @@ -111,6 +110,7 @@ openssl rand -base64 32 Or online: [passwordsgenerator.net](https://passwordsgenerator.net/) For [caddy_backup.env](infrastructure/services/caddy/env/caddy_backup.env) file, you need to change the password(s) for the restic backup. + ```sh RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ ``` @@ -123,7 +123,7 @@ WORDPRESS_DB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw ``` For [wordpress_db.env](infrastructure/services/wordpress/env/wordpress_db.env) file, you need to change the password(s) and user for the database. - + ```sh MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ MARIADB_USER=bensuperpc @@ -131,18 +131,11 @@ MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw ``` For [wordpress_backup.env](infrastructure/services/wordpress/env/wordpress_backup.env) file, you need to change the password(s) for the restic backup. + ```sh RESTIC_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ ``` -For [adminer.env](infrastructure/services/wordpress/env/adminer.env) file, you need to change the password(s) and user for the database. - -```sh -MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ -MARIADB_USER=bensuperpc -MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw -``` - For [gitea.env](infrastructure/services/gitea/env/gitea.env) file, you need to change the password(s) and user for the database. ```sh diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index f7c6696..cfb6033 100644 --- a/infrastructure/docker-compose.yml +++ b/infrastructure/docker-compose.yml @@ -1,6 +1,5 @@ include: # WordPress - - services/wordpress/docker-compose.adminer.yml - services/wordpress/docker-compose.wordpress.yml # Caddy - services/caddy/docker-compose.caddy.yml diff --git a/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile b/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile index bced91e..c05333a 100644 --- a/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile +++ b/infrastructure/services/caddy/config/bensuperpc.org/Caddyfile @@ -60,10 +60,6 @@ it-tools.bensuperpc.org { } } -adminer.bensuperpc.org { - reverse_proxy adminer:8080 -} - uptimekuma.bensuperpc.org { reverse_proxy uptime-kuma:3001 } diff --git a/infrastructure/services/homepage/config/services.yaml b/infrastructure/services/homepage/config/services.yaml index c16260b..c069df6 100644 --- a/infrastructure/services/homepage/config/services.yaml +++ b/infrastructure/services/homepage/config/services.yaml @@ -104,12 +104,6 @@ description: Yacht ping: yacht.bensuperpc.org container: yacht - - adminer: - icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/adminer.png - href: https://adminer.bensuperpc.org/ - description: Adminer - ping: adminer.bensuperpc.org - container: adminer - Games: - minecraft: diff --git a/infrastructure/services/wordpress/docker-compose.adminer.yml b/infrastructure/services/wordpress/docker-compose.adminer.yml deleted file mode 100644 index f273a93..0000000 --- a/infrastructure/services/wordpress/docker-compose.adminer.yml +++ /dev/null @@ -1,17 +0,0 @@ -services: - # Adminer - adminer: - image: adminer:latest - container_name: adminer - profiles: - - adminer - restart: on-failure:5 - env_file: - - ./env/adminer.env - depends_on: - - wordpress_db - - caddy - networks: - - infra-network - security_opt: - - no-new-privileges:true diff --git a/infrastructure/services/wordpress/env/adminer.env b/infrastructure/services/wordpress/env/adminer.env deleted file mode 100644 index 730ae37..0000000 --- a/infrastructure/services/wordpress/env/adminer.env +++ /dev/null @@ -1,4 +0,0 @@ -MARIADB_ROOT_PASSWORD=7L1Ncbquax0B2TCOmrjaQl9n5mnY88bQ -MARIADB_USER=bensuperpc -MARIADB_PASSWORD=lEOEf8cndnDjp84O4Uv5D9zJLJDFatLw -ADMINER_DEFAULT_SERVER=wordpress_db diff --git a/ressources/Arch.drawio b/ressources/Arch.drawio index 498a6b4..cc11ec8 100644 --- a/ressources/Arch.drawio +++ b/ressources/Arch.drawio @@ -158,9 +158,6 @@ - - -