tried new mc location

data/nginx/dev.conf

@@ -0,0 +1,30 @@
+server {
+	listen 443 ssl http2;
+	server_name dev.marcpartensky.com;
+
+	# ssl keys + letsencrypt
+	ssl_certificate /etc/letsencrypt/live/dev.marcpartensky.com/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/dev.marcpartensky.com/privkey.pem;
+
+	include /etc/letsencrypt/options-ssl-nginx.conf;
+	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+	# logs
+	access_log /var/log/nginx/reverse-access.log;
+	error_log /var/log/nginx/reverse-error.log;
+
+
+	location /.well-known/acme-challenge/ {
+		allow all;
+		root /var/www/certbot;
+	}
+
+	location / {
+		proxy_pass http://marcpartensky.com:8000;
+		# proxy_redirect off;
+		proxy_set_header Host $host;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto https;
+	}
+}

data/nginx/docker_api.conf

@@ -0,0 +1,30 @@
+# server {
+# 	listen 443 ssl http2;
+# 	server_name docker.marcpartensky.com;
+
+# 	# ssl keys + letsencrypt
+# 	ssl_certificate /etc/letsencrypt/live/docker.marcpartensky.com/fullchain.pem;
+# 	ssl_certificate_key /etc/letsencrypt/live/docker.marcpartensky.com/privkey.pem;
+
+# 	include /etc/letsencrypt/options-ssl-nginx.conf;
+# 	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+# 	# logs
+# 	access_log /var/log/nginx/reverse-access.log;
+# 	error_log /var/log/nginx/reverse-error.log;
+
+
+# 	location /.well-known/acme-challenge/ {
+# 		allow all;
+# 		root /var/www/certbot;
+# 	}
+
+# 	location /docs {
+# 		proxy_pass http://docker;
+# 		# proxy_redirect off;
+# 		proxy_set_header Host $host;
+# 		proxy_set_header X-Real-IP $remote_addr;
+# 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# 		proxy_set_header X-Forwarded-Proto https;
+# 	}
+# }

data/nginx/gitea.conf

@@ -2,6 +2,8 @@ server {
 	listen 443 ssl http2;
 	server_name git.marcpartensky.com;
 
+	client_max_body_size 10G;
+
 	# ssl keys + letsencrypt
 	ssl_certificate /etc/letsencrypt/live/git.marcpartensky.com/fullchain.pem;
 	ssl_certificate_key /etc/letsencrypt/live/git.marcpartensky.com/privkey.pem;

data/nginx/jenkins.conf

@@ -0,0 +1,30 @@
+server {
+	listen 443 ssl http2;
+	server_name jenkins.marcpartensky.com;
+
+	# ssl keys + letsencrypt
+	ssl_certificate /etc/letsencrypt/live/jenkins.marcpartensky.com/fullchain.pem;
+	ssl_certificate_key /etc/letsencrypt/live/jenkins.marcpartensky.com/privkey.pem;
+
+	include /etc/letsencrypt/options-ssl-nginx.conf;
+	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+	# logs
+	access_log /var/log/nginx/reverse-access.log;
+	error_log /var/log/nginx/reverse-error.log;
+
+
+	location /.well-known/acme-challenge/ {
+		allow all;
+		root /var/www/certbot;
+	}
+
+	location / {
+		proxy_pass http://jenkins:8080;
+		# proxy_redirect off;
+		proxy_set_header Host $host;
+		proxy_set_header X-Real-IP $remote_addr;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto https;
+	}
+}

data/nginx/oxivia.conf

@@ -2,7 +2,7 @@ server {
 	listen 443 ssl http2;
 	server_name oxivia.business.marcpartensky.com;
 
-	client_max_body_size 10M;
+	client_max_body_size 30M;
 
 	# ssl keys + letsencrypt
 	ssl_certificate /etc/letsencrypt/live/oxivia.business.marcpartensky.com/fullchain.pem;

data/nginx/panel.conf

@@ -1,30 +1,30 @@
-server {
-	listen 443 ssl http2;
-	server_name panel.marcpartensky.com;
+# server {
+# 	listen 443 ssl http2;
+# 	server_name panel.marcpartensky.com;
 
-	# ssl keys + letsencrypt
-	ssl_certificate /etc/letsencrypt/live/panel.marcpartensky.com/fullchain.pem;
-	ssl_certificate_key /etc/letsencrypt/live/panel.marcpartensky.com/privkey.pem;
+# 	# ssl keys + letsencrypt
+# 	ssl_certificate /etc/letsencrypt/live/panel.marcpartensky.com/fullchain.pem;
+# 	ssl_certificate_key /etc/letsencrypt/live/panel.marcpartensky.com/privkey.pem;
 
-	include /etc/letsencrypt/options-ssl-nginx.conf;
-	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+# 	include /etc/letsencrypt/options-ssl-nginx.conf;
+# 	ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
 
-	# logs
-	access_log /var/log/nginx/reverse-access.log;
-	error_log /var/log/nginx/reverse-error.log;
+# 	# logs
+# 	access_log /var/log/nginx/reverse-access.log;
+# 	error_log /var/log/nginx/reverse-error.log;
 
 
-	location /.well-known/acme-challenge/ {
-		allow all;
-		root /var/www/certbot;
-	}
+# 	location /.well-known/acme-challenge/ {
+# 		allow all;
+# 		root /var/www/certbot;
+# 	}
 
-	location / {
-		proxy_pass http://panel;
-		# proxy_redirect off;
-		proxy_set_header Host $host;
-		proxy_set_header X-Real-IP $remote_addr;
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto https;
-	}
-}
+# 	location / {
+# 		proxy_pass http://panel;
+# 		# proxy_redirect off;
+# 		proxy_set_header Host $host;
+# 		proxy_set_header X-Real-IP $remote_addr;
+# 		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+# 		proxy_set_header X-Forwarded-Proto https;
+# 	}
+# }

data/wordpress/uploads.ini

@@ -1,5 +1,5 @@
 file_uploads = On
 memory_limit = 500M
-upload_max_filesize = 10M
+upload_max_filesize = 30M
 post_max_size = 500M
 max_execution_time = 600

docker-compose.yml

@@ -52,7 +52,7 @@ services:
     ports:
       - "80:80"
       - "443:443"
-      - "2222:2222"
+      # - "2222:2222"
     volumes:
       - ./data/nginx:/etc/nginx/conf.d
       - /etc/letsencrypt:/etc/letsencrypt
@@ -116,11 +116,6 @@ services:
   website:
     image: marcpartensky/website
     restart: unless-stopped
-    build:
-      context: /root/git/website
-      dockerfile: /root/git/website/Dockerfile
-      args:
-        env_file: /root/git/website/.env
     env_file:
       - ./data/secrets/website.env
     environment:
@@ -131,8 +126,9 @@ services:
     tty: true
     # - ./manage.py collectstatic --noinput
     entrypoint: >
-      sh -c "python manage.py migrate;
-             daphne django_project.asgi:application --port 80 --bind website -v2"
+      sh -c "./manage.py migrate;
+             ./manage.py createsuperuser --noinput;
+             daphne django_project.asgi:application --port 80 --bind 0.0.0.0 -v2"
     # entrypoint: "daphne -e ssl:7000:privateKey=$$KEY:certKey=$$CERT django_project.asgi:application"
     # entrypoint: daphne -b website -e ssl:443:privateKey=/app/privkey.pem:certKey=/app/fullchain.pem django_project.asgi:application
     links:
@@ -188,21 +184,22 @@ services:
   esclave:
     image: marcpartensky/discord-bot
     restart: unless-stopped
-    build: /root/git/discord-bot
+    networks:
+      - discord
     env_file:
       - ./data/secrets/esclave.env
 
   ia:
     image: marcpartensky/discord-bot
     restart: unless-stopped
-    build: /root/git/discord-bot
+    networks:
+      - discord
     env_file:
       - ./data/secrets/ia.env
 
   esclave2:
     image: marcpartensky/discord-bot
     restart: unless-stopped
-    build: /root/git/discord-bot
     env_file:
       - ./data/secrets/esclave2.env
     networks:
@@ -218,16 +215,22 @@ services:
     env_file:
       - ./data/secrets/discord_bot_mongo.env
 
+  docker_api:
+    image: marcpartensky/docker-api
+    restart: unless-stopped
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      - discord
+
   servant:
     image: marcpartensky/servitor
     restart: unless-stopped
-    build: /root/git/servitor
 
   pandoc:
-    build: /root/git/pandoc-api
     image: marcpartensky/pandoc-api
     restart: unless-stopped
-    # working_dir: /app
+    working_dir: /app
     env_file:
       - ./data/secrets/pandoc.env
     entrypoint: "flask run --host pandoc --port 80"
@@ -277,17 +280,18 @@ services:
       - ONLINE_MODE=FALSE # no need for an account
       - DIFFICULTY=hard
       - VIEW_DISTANCE=32
+      - GID=1002
+      - UID=1002
       # - WORLD=/srv/minecraft/zip/Server.zip
       # - SNOOPER_ENABLED=false
     tty: true
     stdin_open: true
     volumes:
-      - /srv/minecraft/data/:/data
+      - ~/.minecraft/minecraft/data/:/data:Z
     ports:
       - "25565:25565"
 
   # pterodactyl:
-  #   build: /root/fork/panel
   #   restart: unless-stopped
   #   networks:
   #     - nginx
@@ -312,11 +316,6 @@ services:
 
 # env:
   #   image: marcpartensky/env
-  #   build:
-  #     context: /root/git/dotfiles
-  #     dockerfile: /root/git/dotfiles/Dockerfile
-  #     args:
-  #       env_file: /root/git/dotfiles/.env
   #   ports:
   #     - "22:7020"
   #     - "8022:7021"
@@ -361,9 +360,6 @@ services:
     image: marcpartensky/ialab
     user: nobody
     restart: unless-stopped
-    build:
-      context: /root/git/ialab
-      dockerfile: /root/git/ialab/Dockerfile
     environment:
       - FLASK_APP=server.py
       # - FLASK_APP=/app/server.py
@@ -380,11 +376,9 @@ services:
       - nginx
 
   open_web_calendar:
-    working_dir: /app
+    image: marcpartensky/open_web_calendar
     restart: unless-stopped
-    build:
-      context: /root/fork/open-web-calendar
-      dockerfile: /root/fork/open-web-calendar/Dockerfile
+    working_dir: /app
     environment:
       - HOST=open_web_calendar
       - PORT=80
@@ -462,6 +456,8 @@ services:
     restart: unless-stopped
     env_file:
       - data/secrets/oxivia.env
+    ports:
+      - "3307:3306"
     volumes:
       - /srv/oxivia_mysql:/var/lib/mysql
     networks:
@@ -520,9 +516,6 @@ services:
   todolist:
     image: marcpartensky/je-todoapp-react
     restart: unless-stopped
-    build:
-      context: /root/je/todoapp/react
-      dockerfile: /root/je/todoapp/react/Dockerfile
     environment:
       - PORT=80
       - SPRING_API_URL=https://api.todolist.marcpartensky.com
@@ -535,9 +528,6 @@ services:
   todolist_api:
     image: marcpartensky/je-todoapp-spring-api
     restart: unless-stopped
-    build:
-      context: /root/je/todoapp/spring-api
-      dockerfile: /root/je/todoapp/spring-api/Dockerfile
     env_file:
       - ./data/secrets/todolist.env
     environment:
@@ -656,12 +646,18 @@ services:
     volumes:
       - /srv/archlinux:/root
 
+  windows:
+    image: mcr.microsoft.com/windows:1903
+    restart: unless-stopped
+    stdin_open: true
+    tty: true
+    volumes:
+      - /srv/windows:/root
+
   healingpath:
     image: marcpartensky/brainperformer
     restart: unless-stopped
     # user: healingpath
-    build:
-      context: /root/git/brainperformer
     env_file: ./data/secrets/healingpath.env
     networks:
       - healingpath
@@ -679,6 +675,44 @@ services:
     networks:
       - healingpath
 
+  # jenkins_docker:
+  #   image: docker:dind
+  #   privileged: true
+  #   networks:
+  #     - jenkins
+  #   environment:
+  #     DOCKER_TLS_CERTDIR: certs
+  #   volumes:
+  #     - /srv/jenkins_docker/certs:/certs/client
+  #     - /srv/jenkins_docker/data:/var/jenkins_home
+  #   ports:
+  #     - "2376:2376"
+
+  jenkins:
+    image: jenkins/jenkins:lts
+    privileged: true
+    user: root
+    ports:
+    #   - "8080:8080"
+      - "50000:50000"
+    volumes:
+      - /srv/jenkins:/var/jenkins_home
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /usr/bin/docker:/usr/bin/docker
+    networks:
+      - nginx
+
+  tmate:
+    image: tmate/tmate-ssh-server
+    ports:
+      - "7027:22"
+    volumes:
+      - ~/.ssh:/root/.ssh:ro
+    environment:
+      SSH_KEYS_PATH: ~/.ssh
+      SSH_HOSTNAME: marcpartensky.com
+      SSH_PORT_LISTEN: 22
+
 volumes:
   letsencrypt:
   nextcloud: