From 8fd511f1683ab51b2392e7beedcc67c53d88f55a Mon Sep 17 00:00:00 2001 From: x Date: Tue, 16 Sep 2025 21:20:42 +0200 Subject: [PATCH] remove no longer needed updating readme and compose --- .gitignore | 2 +- README.md | 30 ++++++-------------- conf/entrypoint.sh | 4 --- conf/nginx/nginx.conf | 57 -------------------------------------- conf/nginx/nginx_w0bm.conf | 34 ----------------------- docker-compose.yaml | 4 --- 6 files changed, 10 insertions(+), 121 deletions(-) delete mode 100644 conf/entrypoint.sh delete mode 100644 conf/nginx/nginx.conf delete mode 100644 conf/nginx/nginx_w0bm.conf diff --git a/.gitignore b/.gitignore index b139dd3..096d8be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -w0bm/public +w0bm-data w0bm-db \ No newline at end of file diff --git a/README.md b/README.md index 1c87bac..46fb233 100644 --- a/README.md +++ b/README.md @@ -12,33 +12,21 @@ First of all put a .webm file named 1.webm in `w0bm-data/b` `docker exec -it w0bm-legacy /bin/bash` -`php7.1 artisan migrate` +`php artisan migrate` -`php7.1 artisan db:seed` +`php artisan db:seed` -`php7.1 artisan tags` +`php artisan tags` -Now visit http://localhost:8090 +Now visit http://localhost:8080 -To get upload working do this +# Troubleshooting -``` -$ git clone https://git.lat/w0bm/w0bm.git -$ cd w0bm -$ mkdir public/thumbs -$ mkdir public/b -$ mkdir public/thumbs/beta -$ mkdir public/thumbs/blurred -``` +On the host do this to fix -`docker exec -it w0bm /bin/bash` +- Uploads + - `sudo chown -R 1000:1000 w0bm-data` -``` -root@703c9472fed5:/opt/w0bm/public# chmod -R 777 thumbs/ -root@703c9472fed5:/opt/w0bm/public# chmod -R 777 b -``` - -inside the container, it applied to the mount # Reverse Proxy @@ -51,7 +39,7 @@ server { server_name $url; … location / { - proxy_pass http://localhost:8090; + proxy_pass http://localhost:8080; proxy_set_header Host $url; proxy_set_header X-Forwarded-Proto $scheme; sub_filter 'http://' 'https://'; diff --git a/conf/entrypoint.sh b/conf/entrypoint.sh deleted file mode 100644 index a7939ac..0000000 --- a/conf/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -e -php-fpm7.1 -F -R & -exec nginx -g "daemon off;" \ No newline at end of file diff --git a/conf/nginx/nginx.conf b/conf/nginx/nginx.conf deleted file mode 100644 index 69c8fe2..0000000 --- a/conf/nginx/nginx.conf +++ /dev/null @@ -1,57 +0,0 @@ -user root; -worker_processes auto; -worker_cpu_affinity auto; -pid /run/nginx.pid; -error_log /var/log/nginx/error.log; -include /etc/nginx/modules-enabled/*.conf; -events { - worker_connections 768; - # multi_accept on; -} - -http { - - ## - # Basic Settings - ## - - sendfile on; - tcp_nopush on; - types_hash_max_size 2048; - server_tokens off; # Recommended practice is to turn this off - # server_names_hash_bucket_size 64; - # server_name_in_redirect off; - - include /etc/nginx/mime.types; - default_type application/octet-stream; - ## - # SSL Settings - ## - - ssl_protocols TLSv1.2 TLSv1.3; # Dropping SSLv3 (POODLE), TLS 1.0, 1.1 - ssl_prefer_server_ciphers off; # Don't force server cipher order. - - ## - # Logging Settings - ## - - access_log /var/log/nginx/access.log; - - ## - # Gzip Settings - ## - gzip on; - - # gzip_vary on; - # gzip_proxied any; - # gzip_comp_level 6; - # gzip_buffers 16 8k; - # gzip_http_version 1.1; - # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript; - - ## - # Virtual Host Configs - ## - - include /etc/nginx/conf.d/*.conf; -} \ No newline at end of file diff --git a/conf/nginx/nginx_w0bm.conf b/conf/nginx/nginx_w0bm.conf deleted file mode 100644 index 30d3827..0000000 --- a/conf/nginx/nginx_w0bm.conf +++ /dev/null @@ -1,34 +0,0 @@ - -#w0bm.com -server { - server_name _; - - listen 8090; - - root /opt/w0bm/public; - client_max_body_size 500M; - - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_index index.php; - include fastcgi.conf; - fastcgi_param PATH_TRANSLATED $document_root$fastcgi_script_name; - #fastcgi_param GEOIP_ADDR $remote_addr; - #fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_pass unix:/run/php/php7.1-fpm.sock; - } - location ~* \.(?:css|js)$ { - gzip on; - expires 1y; - add_header Cache-Control "public"; - } - location ~* \.(?:jpg|jpeg|gif|png|ico|svg)$ { - expires 1M; - access_log off; - add_header Cache-Control "public"; - } - location / { - try_files $uri $uri/ /index.php?$args; - } - -} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index fa8f0bf..138586e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,14 +4,10 @@ services: user: 1000:1000 container_name: w0bm image: w0bm:f-1 - # hostname: "w0bm.lokal" - build: - dockerfile: Dockerfile depends_on: - mariadb networks: - w0bm - # For later volumes: - ./w0bm-data/logs/:/home/w0bm/application/w0bm/storage/logs/ - ./w0bm-data/b/:/home/w0bm/application/w0bm/public/b/