diff --git a/..env.swp b/..env.swp deleted file mode 100644 index 0ac13b7..0000000 Binary files a/..env.swp and /dev/null differ diff --git a/.env b/.env index 90ceae7..2a04e57 100644 --- a/.env +++ b/.env @@ -1,13 +1,11 @@ # .env # GitLab root credentials - GITLAB_ROOT_EMAIL=jacques@jacquesingram.online GITLAB_ROOT_PASSWORD=Abcd@0123456789 # GitLab proxy settings - GITLAB_VIRTUAL_PORT=80 GITLAB_VIRTUAL_HOST=gitlab.jacquesingram.online @@ -15,7 +13,6 @@ GITLAB_VIRTUAL_HOST=gitlab.jacquesingram.online GITLAB_LETSENCRYPT_HOST=gitlab.jacquesingram.online # Xochi Database Credentials - XOCHI_DB_ROOT_PASSWORD=J@cques011 XOCHI_DB_DATABASE=hello_world_wordpress @@ -25,17 +22,15 @@ XOCHI_DB_USER=hello_world_wordpress XOCHI_DB_PASSWORD=hello_world_wordpress # WordPress Front-end +WP_DB_HOST=xochi-database:3306 -WP_DB_HOST=wordpress-database:3306 +WP_DB_USER=hello_world_wordpress -WP_DB_USER=wordpress +WP_DB_PASSWORD=hello_world_wordpress -WP_DB_PASSWORD=lenape - -WP_DB_NAME=lenape +WP_DB_NAME=hello_world_wordpress # Database Online Server - DB_OS_ROOT_PASSWORD=lenape DB_OS_DATABASE=sandbox @@ -45,7 +40,4 @@ DB_OS_USER=lenape DB_OS_PASSWORD=lenape # Database Browser - -DB_BROWSER_ROOT_PASSWORD=lenape - - +DB_BROWSER_ROOT_PASSWORD=lenape \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1330075 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# Logs +*.log +logs/ + +# Dependencies +node_modules/ +vendor/ + +# Environment variables +.env +.env.local + +# Build outputs +dist/ +build/ +*.o +*.exe + +# IDE files +.vscode/ +.idea/ +*.swp +*.swo + +# OS files +.DS_Store +Thumbs.db diff --git a/compose.yaml.backup b/compose.yaml.backup index b291521..88d8e51 100644 --- a/compose.yaml.backup +++ b/compose.yaml.backup @@ -77,13 +77,13 @@ services: environment: - MYSQL_ROOT_PASSWORD: J@cques011 + MYSQL_ROOT_PASSWORD: ${XOCHI_DB_ROOT_PASSWORD} - MYSQL_DATABASE: hello_world_wordpress + MYSQL_DATABASE: ${XOCHI_DB_DATABASE} - MYSQL_USER: hello_world_wordpress + MYSQL_USER: ${XOCHI_DB_USER} - MYSQL_PASSWORD: hello_world_wordpress + MYSQL_PASSWORD: ${XOCHI_DB_PASSWORD} volumes: @@ -193,13 +193,13 @@ services: environment: - WORDPRESS_DB_HOST: xochi-database:3306 + WORDPRESS_DB_HOST: ${WP_DB_HOST} - WORDPRESS_DB_USER: hello_world_wordpress + WORDPRESS_DB_USER: ${WP_DB_USER} - WORDPRESS_DB_PASSWORD: hello_world_wordpress + WORDPRESS_DB_PASSWORD: ${WP_DB_PASSWORD} - WORDPRESS_DB_NAME: hello_world_wordpress + WORDPRESS_DB_NAME: ${WP_DB_NAME} VIRTUAL_HOST: jacquesingram.online @@ -261,15 +261,15 @@ services: environment: - GITLAB_ROOT_EMAIL: "jacques@jacquesingram.online" + GITLAB_ROOT_EMAIL: ${GITLAB_ROOT_EMAIL} - GITLAB_ROOT_PASSWORD: "Abcd@0123456789" + GITLAB_ROOT_PASSWORD: ${GITLAB_ROOT_PASSWORD} - VIRTUAL_PORT: 80 + VIRTUAL_PORT: ${GITLAB_VIRTUAL_PORT} - VIRTUAL_HOST: gitlab.jacquesingram.online + VIRTUAL_HOST: ${GITLAB_VIRTUAL_HOST} - LETSENCRYPT_HOST: gitlab.jacquesingram.online + LETSENCRYPT_HOST: ${GITLAB_LETSENCRYPT_HOST} volumes: @@ -290,9 +290,9 @@ services: restart: unless-stopped - privileged: true + # privileged: true - user: root + # user: root volumes: @@ -403,13 +403,13 @@ services: environment: - MYSQL_ROOT_PASSWORD: lenape + MYSQL_ROOT_PASSWORD: ${DB_OS_ROOT_PASSWORD} - MYSQL_DATABASE: sandbox + MYSQL_DATABASE: ${DB_OS_DATABASE} - MYSQL_USER: lenape + MYSQL_USER: ${DB_OS_USER} - MYSQL_PASSWORD: lenape + MYSQL_PASSWORD: ${DB_OS_PASSWORD} databases.jacquesingram.online-browser: @@ -437,7 +437,7 @@ services: PMA_HOST: databases.jacquesingram.online-server - MYSQL_ROOT_PASSWORD: lenape + MYSQL_ROOT_PASSWORD: ${DB_BROWSER_ROOT_PASSWORD} VIRTUAL_PORT: 80 diff --git a/compose.yaml.good b/compose.yaml.good deleted file mode 100644 index e5f5c63..0000000 --- a/compose.yaml.good +++ /dev/null @@ -1,468 +0,0 @@ -services: - -########################################## -## -## xochi / networking -## -########################################## - - xochi-proxy: - - container_name: xochi-proxy - - image: jacqueskingram/docker-http-proxy - - restart: unless-stopped - - ports: - - - 80:80 - - - 443:443 - - volumes: - - - /var/run/docker.sock:/tmp/docker.sock:ro - - - /var/docker/nginx/html:/usr/share/nginx/html - - - /var/docker/nginx/certs:/etc/nginx/certs - - - /var/docker/nginx/vhost:/etc/nginx/vhost.d - - logging: - - options: - - max-size: "10m" - - max-file: "3" - - xochi-letsencrypt: - - container_name: xochi-letsencrypt - - image: jrcs/letsencrypt-nginx-proxy-companion - - restart: unless-stopped - - volumes_from: - - - xochi-proxy - - volumes: - - - /var/run/docker.sock:/var/run/docker.sock - - - /var/docker/nginx/acme:/etc/acme.sh - - environment: - - DEFAULT_EMAIL: jacques@jacquesingram.online - -########################################## -## -## xochi / relational data -## -########################################## - - xochi-database: - - container_name: xochi-database - - image: mariadb:latest - - restart: unless-stopped - - - environment: - - MYSQL_ROOT_PASSWORD: J@cques011 - - MYSQL_DATABASE: hello_world_wordpress - - MYSQL_USER: hello_world_wordpress - - MYSQL_PASSWORD: hello_world_wordpress - - volumes: - - - /volumes/jacquesingram.online/database:/var/lib/mysql - - xochi-phpmyadmin: - - container_name: xochi-phpmyadmin - - image: beeyev/phpmyadmin-lightweight - - depends_on: - - - xochi-database - - links: - - - xochi-database - - environment: - - PMA_HOST: xochi-database - - VIRTUAL_HOST: database.xochi.jacquesingram.online - - LETSENCRYPT_HOST: database.xochi.jacquesingram.online - -########################################## -## -## jacquesingram.online / entertainment -## -########################################## - - radio.jacquesingram.online: - - container_name: radio.jacquesingram.online - - image: emby/embyserver - - hostname: emby - - restart: unless-stopped - - volumes: - - - /volumes/jacquesingram.online/media:/media - - - /volumes/jacquesingram.online/radio/:/config - - ports: - - - 8096:8096 - - expose: - - - 8096 - - environment: - - VIRTUAL_PORT: 8096 - - VIRTUAL_HOST: radio.jacquesingram.online - - LETSENCRYPT_HOST: radio.jacquesingram.online - -########################################## -## -## jacquesingram.online / productivity -## -########################################## - - timer.jacquesingram.online: - - container_name: timer.jacquesingram.online - - image: jacqueskingram/timer.jacquesingram.online - - restart: unless-stopped - - environment: - - VIRTUAL_HOST: timer.jacquesingram.online - - LETSENCRYPT_HOST: timer.jacquesingram.online - -########################################## -## -## jacquesingram.online / wordpress -## -########################################## - - www.jacquesingram.online: - - container_name: www.jacquesingram.online - - image: wordpress:latest - - restart: unless-stopped - - depends_on: - - - xochi-database - - volumes: - - - /volumes/jacquesingram.online/wordpress:/var/www/html - - environment: - - WORDPRESS_DB_HOST: xochi-database:3306 - - WORDPRESS_DB_USER: hello_world_wordpress - - WORDPRESS_DB_PASSWORD: hello_world_wordpress - - WORDPRESS_DB_NAME: hello_world_wordpress - - VIRTUAL_HOST: jacquesingram.online - - LETSENCRYPT_HOST: jacquesingram.online - -########################################## -## -## jacquesingram.online / devops -## -########################################## - - code.jacquesingram.online: - - container_name: code.jacquesingram.online - - image: gitea/gitea:1.24 - - restart: unless-stopped - - volumes: - - - /volumes/jacquesingram.online/gitea:/data - - - /etc/timezone:/etc/timezone:ro - - - /etc/localtime:/etc/localtime:ro - - - ports: - - - 3000:3000 - - - expose: - - - 3000 - - environment: - - USER_UID: 1000 - - USER_GID: 1000 - - VIRTUAL_PORT: 3000 - - VIRTUAL_HOST: code.jacquesingram.online - - LETSENCRYPT_HOST: code.jacquesingram.online - - gitlab-server: - - image: 'gitlab/gitlab-ce:latest' - - container_name: lenape-gitlab - - ports: - - - '28001:80' - - environment: - - GITLAB_ROOT_EMAIL: "jacques@jacquesingram.online" - - GITLAB_ROOT_PASSWORD: "Abcd@0123456789" - - VIRTUAL_PORT: 80 - - VIRTUAL_HOST: gitlab.jacquesingram.online - - LETSENCRYPT_HOST: gitlab.jacquesingram.online - - - volumes: - - - /volumes/jacquesingram.online/gitlab/config:/etc/gitlab - - - /volumes/jacquesingram.online/gitlab/data:/var/opt/gitlab - - expose: - - - 80 - - jenkins.jacquesingram.online: - - container_name: jenkins.jacquesingram.online - - image: jenkins/jenkins:lts - - restart: unless-stopped - - # privileged: true - - # user: root - - volumes: - - - /volumes/jacquesingram.online/jenkins/:/var/jenkins_home - - - /var/run/docker.sock:/var/run/docker.sock - - expose: - - - 8080 - - environment: - - VIRTUAL_PORT: 8080 - - VIRTUAL_HOST: jenkins.jacquesingram.online - - LETSENCRYPT_HOST: jenkins.jacquesingram.online - -########################################## -## -## Jobs Fetcher -## -########################################## - - lenape-jobs-fetcher-apis: - - container_name: lenape-jobs-fetcher-apis - - image: jacqueskingram/lenape-jobs-fetcher-server - - ports: - - - 8888:5000 - - environment: - - VIRTUAL_PORT: 5000 - - VIRTUAL_HOST: apis.jacquesingram.online - - LETSENCRYPT_HOST: apis.jacquesingram.online - - lenape-jobs-fetcher-web: - - container_name: lenape-jobs-fetcher-web - - image: jacqueskingram/lenape-jobs-fetcher-web - -## ports: -## -## - 8880:80 - - environment: - - VIRTUAL_PORT: 80 - - VIRTUAL_HOST: jobs.jacquesingram.online - - LETSENCRYPT_HOST: jobs.jacquesingram.online -########################################## -## -## links.jacquesingram.online -## -########################################## - - links.jacquesingram.online: - - container_name: links.jacquesingram.online - - image: jacqueskingram/links.jacquesingram.online - - restart: unless-stopped - - ports: - - - "8000:80" - environment: - - VIRTUAL_PORT: 80 - - VIRTUAL_HOST: links.jacquesingram.online - - LETSENCRYPT_HOST: links.jacquesingram.online - -########################################## -## -## database.jacquesingram.online -## -########################################## - - - databases.jacquesingram.online-server: - - container_name: databases.jacquesingram.online-server - - image: jacqueskingram/databases.jacquesingram.online:server - - restart: unless-stopped - - ports: - - - 3308:3306 - -## volumes: -## -## - /tmp/volumes/academy/database:/var/lib/mysql - - environment: - - MYSQL_ROOT_PASSWORD: lenape - - MYSQL_DATABASE: sandbox - - MYSQL_USER: lenape - - MYSQL_PASSWORD: lenape - - databases.jacquesingram.online-browser: - - container_name: databases.jacquesingram.online-browser - - image: beeyev/phpmyadmin-lightweight - - restart: unless-stopped - - depends_on: - - - databases.jacquesingram.online-server - - ports: - - - 3381:80 - - - expose: - - - 80 - - - environment: - - PMA_HOST: databases.jacquesingram.online-server - - MYSQL_ROOT_PASSWORD: lenape - - VIRTUAL_PORT: 80 - - VIRTUAL_HOST: databases.jacquesingram.online - - LETSENCRYPT_HOST: databases.jacquesingram.online - - databases.jacquesingram.online-docs: - - container_name: databases.jacquesingram.online-docs - - image: jacqueskingram/databases.jacquesingram.online:docs - - expose: - - - 80 - - - environment: - - VIRTUAL_PORT: 80 - - VIRTUAL_HOST: docs.databases.jacquesingram.online - - LETSENCRYPT_HOST: docs.databases.jacquesingram.online - - - diff --git a/env b/env new file mode 100644 index 0000000..e69de29