Эх сурвалжийг харах

allineamento che non ci capisco piu' una mazza£

mauro 2 өдөр өмнө
parent
commit
99561f1be7

+ 0 - 157
docker-compose.09092025

@@ -1,157 +0,0 @@
-services:
-  homeassistant:
-    image: ghcr.io/home-assistant/home-assistant:stable
-    privileged: true
-    restart: unless-stopped
-    volumes:
-      - /mnt/Data/Software/Homeassistant:/config
-      - /run/dbus:/run/dbus:ro
-    environment:
-     TZ: Europe/Rome
-    ports:
-      - 8123:8123
-  
-  mariadb:
-    image: local/mariadb
-    build: 
-      dockerfile: ./mariadb/mariadb.yml
-    volumes:
-      - /home/MariaDb/var/lib/mysql:/var/lib/mysql
-    restart: unless-stopped
-    ports:
-      - 3306:3306
-    entrypoint: ['bin/bash','/root/mariadb.sh']
-    environment:
-      MARIADB_PASSWORD: "PassworD"
-
-  console:
-    image: console
-    build:
-      dockerfile: ./console/console.yml
-    volumes:
-      - /mnt/Data/Software/Shared_data:/home/shared_data
-      - archivio_data:/mnt/Data
-    entrypoint: ['bin/bash','/root/console.sh']
-    restart: unless-stopped 
-
-  gogs:
-    image: local/gogs
-    build: 
-      dockerfile: ./gogs/gogs.yml
-    volumes:
-      - /mnt/Data/Software/Gogs:/home/gogs
-    restart: unless-stopped
-    ports:
-      - 3000:3000
-    entrypoint: ['bin/bash','/root/gogs.sh']
-
-  password:
-    image: local/password
-    build: 
-      dockerfile: ./password/password.yml
-    volumes:
-      - /mnt/Data/Software/Password:/home/password
-    restart: unless-stopped
-    ports:
-      - 3020:3020
-    entrypoint: ['bin/bash','/root/password.sh']
-    environment:
-      PASSWORDWEB_PORT: 0.0.0.0:3020
-      PASSWORDWEB_FILE: /home/password/PasswordFiles/multiword.txt
-      PASSWORDWEB_PIN: 8
-
-  syncthing:
-    image: local/syncthing
-    build: 
-      dockerfile: ./syncthing/syncthing.yml
-    volumes:
-      - /home/Syncthing:/home/syncthing
-      - archivio_data:/mnt/Data/Archivio
-      - scansioni_data:/mnt/Data/Scansioni
-      - software_data:/mnt/Data/Software
-    restart: unless-stopped
-    ports:
-      - 8384:8384
-    entrypoint: ['/bin/bash','/root/syncthing.sh']
-
-  mqtt:
-    image: local/mqtt
-    build:
-      dockerfile: ./mqtt/mqtt.yml
-    restart: unless-stopped
-    ports:
-      - 1883:1883
-    entrypoint: ['/bin/bash','/root/mqtt.sh']
-    volumes:
-      - mqtt_etc:/mnt/Software
-
-  ftp:
-    image: local/ftp
-    build:
-      dockerfile: ./ftp/ftp.yml
-    ports:
-      - 21:21
-      - 49152-49352:49152-49352
-    entrypoint: ['/bin/bash','/root/ftp.sh']
-    volumes: 
-      - archivio_data:/mnt/Archivio
-    restart: unless-stopped
-
-  #lychee:
-  #  image: local/lychee
-  #  build:
-  #    dockerfile: ./lychee/lychee.yml
-  #  depends_on:
-  #    - nginx
-  #    - php-fpm
-  #  #restart: unless-stopped
-
-volumes:
-  mariadb_data:
-  gogs_data:
-  shared_data:
-  password_data:
-  syncthing_data:
-
-  archivio_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Archivio"
-
-  scansioni_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Scansioni"
-
-  software_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software"
-
-  nextcloud_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_data"
-
-  nextcloud_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_etc"
-
-  mqtt_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software"
-

+ 0 - 196
docker-compose.10112025

@@ -1,196 +0,0 @@
-services:
-  homeassistant:
-    image: ghcr.io/home-assistant/home-assistant:stable
-    privileged: true
-    restart: unless-stopped
-    volumes:
-      - /mnt/Data/Software/Homeassistant:/config
-      - /run/dbus:/run/dbus:ro
-    environment:
-     TZ: Europe/Rome
-    ports:
-      - 8123:8123
-  
-  mariadb:
-    image: local/mariadb
-    build: 
-      dockerfile: ./mariadb/mariadb.yml
-    volumes:
-      - /home/MariaDb/var/lib/mysql:/var/lib/mysql
-    restart: unless-stopped
-    ports:
-      - 3306:3306
-    entrypoint: ['bin/bash','/root/mariadb.sh']
-    environment:
-      MARIADB_PASSWORD: "PassworD"
-
-  console:
-    image: console
-    build:
-      dockerfile: ./console/console.yml
-    volumes:
-      - /mnt/Data/Software/Shared_data:/home/shared_data
-      - archivio_data:/mnt/Data
-    entrypoint: ['bin/bash','/root/console.sh']
-    restart: unless-stopped 
-
-  gogs:
-    image: local/gogs
-    build: 
-      dockerfile: ./gogs/gogs.yml
-    volumes:
-      - /mnt/Data/Software/Gogs:/home/gogs
-    restart: unless-stopped
-    ports:
-      - 3000:3000
-    entrypoint: ['bin/bash','/root/gogs.sh']
-
-  password:
-    image: local/password
-    build: 
-      dockerfile: ./password/password.yml
-    volumes:
-      - /mnt/Data/Software/Password:/home/password
-    restart: unless-stopped
-    ports:
-      - 3020:3020
-    entrypoint: ['bin/bash','/root/password.sh']
-    environment:
-      PASSWORDWEB_PORT: 0.0.0.0:3020
-      PASSWORDWEB_FILE: /home/password/PasswordFiles/multiword.txt
-      PASSWORDWEB_PIN: 8
-
-  syncthing:
-    image: local/syncthing
-    build: 
-      dockerfile: ./syncthing/syncthing.yml
-    volumes:
-      - /home/Syncthing:/home/syncthing
-      - archivio_data:/mnt/Data/Archivio
-      - scansioni_data:/mnt/Data/Scansioni
-      - software_data:/mnt/Data/Software
-    restart: unless-stopped
-    ports:
-      - 8384:8384
-    entrypoint: ['/bin/bash','/root/syncthing.sh']
-
-  mqtt:
-    image: local/mqtt
-    build:
-      dockerfile: ./mqtt/mqtt.yml
-    restart: unless-stopped
-    ports:
-      - 1883:1883
-    entrypoint: ['/bin/bash','/root/mqtt.sh']
-    volumes:
-      - mqtt_etc:/mnt/Software
-
-  ftp:
-    image: local/ftp
-    build:
-      dockerfile: ./ftp/ftp.yml
-    ports:
-      - 21:21
-      - 49152-49352:49152-49352
-    entrypoint: ['/bin/bash','/root/ftp.sh']
-    volumes: 
-      - archivio_data:/mnt/Archivio
-    restart: unless-stopped
-
-  samba:
-    image: local/samba
-    build: 
-      dockerfile: ./samba/samba.yml
-    volumes:
-      - samba_etc:/etc/samba
-      - samba_var:/var/lib/samba
-      - archivio_data:/mnt/Data/Archivio
-      - scansioni_data:/mnt/Data/Scansioni
-      - gabriella_data:/mnt/Data/Gabriella
-    restart: unless-stopped
-    ports:
-      - 445:445
-      - 139:139
-    entrypoint: ['/bin/bash','/root/samba.sh']
-
-
-  #lychee:
-  #  image: local/lychee
-  #  build:
-  #    dockerfile: ./lychee/lychee.yml
-  #  depends_on:
-  #    - nginx
-  #    - php-fpm
-  #  #restart: unless-stopped
-
-volumes:
-  mariadb_data:
-  gogs_data:
-  shared_data:
-  password_data:
-  syncthing_data:
-
-  archivio_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Archivio"
-
-  gabriella_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Gabriella"
-
-
-  scansioni_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Scansioni"
-
-  software_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software"
-
-  nextcloud_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_data"
-
-  nextcloud_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_etc"
-
-  mqtt_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software"
-
-  samba_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Samba_CC/etc"
-
-  samba_var:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Samba_CC/var"
-

+ 0 - 207
docker-compose.11112025

@@ -1,207 +0,0 @@
-services:
-  homeassistant:
-    image: ghcr.io/home-assistant/home-assistant:stable
-    privileged: true
-    restart: unless-stopped
-    volumes:
-      - /mnt/Data/Software/Homeassistant:/config
-      - /run/dbus:/run/dbus:ro
-    environment:
-     TZ: Europe/Rome
-    ports:
-      - 8123:8123
-  
-  mariadb:
-    image: local/mariadb
-    build: 
-      dockerfile: ./mariadb/mariadb.yml
-    volumes:
-      - /home/MariaDb/var/lib/mysql:/var/lib/mysql
-    restart: unless-stopped
-    ports:
-      - 3306:3306
-    entrypoint: ['bin/bash','/root/mariadb.sh']
-    environment:
-      MARIADB_PASSWORD: "PassworD"
-
-  console:
-    image: console
-    build:
-      dockerfile: ./console/console.yml
-    volumes:
-      - /mnt/Data/Software/Shared_data:/home/shared_data
-      - archivio_data:/mnt/Data
-    entrypoint: ['bin/bash','/root/console.sh']
-    restart: unless-stopped 
-
-  gogs:
-    image: local/gogs
-    build: 
-      dockerfile: ./gogs/gogs.yml
-    volumes:
-      - /mnt/Data/Software/Gogs:/home/gogs
-    restart: unless-stopped
-    ports:
-      - 3000:3000
-    entrypoint: ['bin/bash','/root/gogs.sh']
-
-  wiki:
-    image: wiki
-    build: 
-      dockerfile: ./wiki/wiki.yml
-    volumes:
-      - /mnt/Data/Software/Wiki:/home/wiki
-    restart: unless-stopped
-    ports:
-      - 3100:8080
-    entrypoint: ['bin/bash','/root/wiki.sh']
-
-  password:
-    image: local/password
-    build: 
-      dockerfile: ./password/password.yml
-    volumes:
-      - /mnt/Data/Software/Password:/home/password
-    restart: unless-stopped
-    ports:
-      - 3020:3020
-    entrypoint: ['bin/bash','/root/password.sh']
-    environment:
-      PASSWORDWEB_PORT: 0.0.0.0:3020
-      PASSWORDWEB_FILE: /home/password/PasswordFiles/multiword.txt
-      PASSWORDWEB_PIN: 8
-
-  syncthing:
-    image: local/syncthing
-    build: 
-      dockerfile: ./syncthing/syncthing.yml
-    volumes:
-      - /home/Syncthing:/home/syncthing
-      - archivio_data:/mnt/Data/Archivio
-      - scansioni_data:/mnt/Data/Scansioni
-      - software_data:/mnt/Data/Software
-    restart: unless-stopped
-    ports:
-      - 8384:8384
-    entrypoint: ['/bin/bash','/root/syncthing.sh']
-
-  mqtt:
-    image: local/mqtt
-    build:
-      dockerfile: ./mqtt/mqtt.yml
-    restart: unless-stopped
-    ports:
-      - 1883:1883
-    entrypoint: ['/bin/bash','/root/mqtt.sh']
-    volumes:
-      - mqtt_etc:/mnt/Software
-
-  ftp:
-    image: local/ftp
-    build:
-      dockerfile: ./ftp/ftp.yml
-    ports:
-      - 21:21
-      - 49152-49352:49152-49352
-    entrypoint: ['/bin/bash','/root/ftp.sh']
-    volumes: 
-      - archivio_data:/mnt/Archivio
-    restart: unless-stopped
-
-  samba:
-    image: local/samba
-    build: 
-      dockerfile: ./samba/samba.yml
-    volumes:
-      - samba_etc:/etc/samba
-      - samba_var:/var/lib/samba
-      - archivio_data:/mnt/Data/Archivio
-      - scansioni_data:/mnt/Data/Scansioni
-      - gabriella_data:/mnt/Data/Gabriella
-    restart: unless-stopped
-    ports:
-      - 445:445
-      - 139:139
-    entrypoint: ['/bin/bash','/root/samba.sh']
-
-
-  #lychee:
-  #  image: local/lychee
-  #  build:
-  #    dockerfile: ./lychee/lychee.yml
-  #  depends_on:
-  #    - nginx
-  #    - php-fpm
-  #  #restart: unless-stopped
-
-volumes:
-  mariadb_data:
-  gogs_data:
-  shared_data:
-  password_data:
-  syncthing_data:
-
-  archivio_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Archivio"
-
-  gabriella_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Gabriella"
-
-
-  scansioni_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Scansioni"
-
-  software_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software"
-
-  nextcloud_data:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_data"
-
-  nextcloud_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_etc"
-
-  mqtt_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software"
-
-  samba_etc:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Samba_CC/etc"
-
-  samba_var:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Samba_CC/var"
-

+ 70 - 33
docker-compose.yml

@@ -18,6 +18,7 @@ services:
       dockerfile: mariadb.yml
     volumes:
       - /home/MariaDb/var/lib/mysql:/var/lib/mysql
+
     restart: unless-stopped
     ports:
       - 3306:3306
@@ -112,7 +113,7 @@ services:
       - 1883:1883
     entrypoint: ['/bin/bash','/root/mqtt.sh']
     volumes:
-      - mqtt_etc:/mnt/Software
+      - software_data:/mnt/Software
 
   ftp:
     image: ftp
@@ -150,41 +151,70 @@ services:
     ports:
       - 5000:5000
 
-  ##lychee:
-  #  image: lychee
-  #  build:
-  #    context: lychee
-  #    dockerfile: lychee.yml
-  #    args:
-  #      PUID: '1000'
-  #      PGID: '1000'
-  #      USER: 'lychee'
-  #      PHP_TZ: 'Europe/Rome'
-  #  ports:
-  #    - 8080:80
-  #  depends_on:
-  #    - console
-  #  volumes:
-  #    - //mnt/Data/Software/Lychee/default:/etc/nginx/sites-enabled/default
-  #    - //mnt/Data/Software/Lychee/www.conf:/etc/php/8.4/fpm/pool.d/www.conf
-  #    - //mnt/Data/Software/Lychee/env:/var/www/html/Lychee/.env.x
-  #  restart: unless-stopped
-  #  entrypoint: ['/bin/bash','/root/start.sh']
+  lychee:
+    image: lychee
+    build:
+      context: lychee
+      dockerfile: lychee.yml
+      args:
+        PUID: '1000'
+        PGID: '1000'
+        USER: 'lychee'
+        PHP_TZ: 'Europe/Rome'
+    ports:
+      - 8080:80
+    depends_on:
+      - console
+    volumes:
+      - //mnt/Data/Software/Lychee/default.conf:/etc/nginx/http.d/default.conf
+      - //mnt/Data/Software/Lychee/www.conf:/etc/php/8.4/fpm/pool.d/www.conf
+      #- //mnt/Data/Software/Lychee/env:/var/www/html/Lychee/.env.xdd
+      - //mnt/Data/Archivio/Lychee:/var/www/html/Lychee/storage
+    restart: unless-stopped
+    entrypoint: ['/bin/bash','/root/start.sh']
 
    
-
 volumes:
+  #shared_data:
+  #  driver: local
+  #  driver_opts:
+  #    type: nfs
+  #    o: "addr=127.0.0.1,soft,rw,async"
+  #    device: ":/mnt/Data/Archivio"
+
+  password_data:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw,async"
+      device: ":/mnt/Data/Archivio"
+
   mariadb_data:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw,async"
+      device: ":/mnt/Data/Archivio"
+
   gogs_data:
-  shared_data:
-  password_data:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw,async"
+      device: ":/mnt/Data/Archivio"
+
   syncthing_data:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw,async"
+      device: ":/mnt/Data/Archivio"
 
   archivio_data:
     driver: local
     driver_opts:
       type: nfs
-      o: "addr=127.0.0.1,soft,rw"
+      o: "addr=127.0.0.1,soft,rw,async"
       device: ":/mnt/Data/Archivio"
 
   gabriella_data:
@@ -206,29 +236,29 @@ volumes:
     driver: local
     driver_opts:
       type: nfs
-      o: "addr=127.0.0.1,soft,rw"
+      o: "addr=127.0.0.1,soft,rw,async"
       device: ":/mnt/Data/Software"
 
-  nextcloud_data:
+  shared_data:
     driver: local
     driver_opts:
       type: nfs
-      o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_data"
+      o: "addr=127.0.0.1,soft,rw,async"
+      device: ":/mnt/Data/Software/Shared_data"
 
-  nextcloud_etc:
+  nextcloud_data:
     driver: local
     driver_opts:
       type: nfs
       o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software/Nextcloud_etc"
+      device: ":/mnt/Data/Software/Nextcloud_data"
 
-  mqtt_etc:
+  nextcloud_etc:
     driver: local
     driver_opts:
       type: nfs
       o: "addr=127.0.0.1,soft,rw"
-      device: ":/mnt/Data/Software"
+      device: ":/mnt/Data/Software/Nextcloud_etc"
 
   samba_etc:
     driver: local
@@ -251,4 +281,11 @@ volumes:
       o: "addr=127.0.0.1,soft,rw"
       device: ":/mnt/Data/Software/Registry"
 
+  #mqtt_etc:
+  #  driver: local
+  #  driver_opts:
+  #    type: nfs
+  #    o: "addr=127.0.0.1,soft,rw"
+  #    device: ":/mnt/Data/Software"
+
 

+ 270 - 0
lychee/env

@@ -0,0 +1,270 @@
+APP_NAME=Lychee
+APP_ENV=production
+APP_KEY=
+APP_DEBUG=false
+# This MUST contain the host name up to the Top Level Domain (tld) e.g. .com, .org etc.
+APP_URL=http://966.it
+APP_FORCE_HTTPS=false
+
+# If using Lychee in a sub folder, specify the path after the tld here.
+# For example for https://lychee.test/path/to/lychee
+# Set APP_URL=https://lychee.test
+# and APP_DIR=/path/to/lychee
+# We (LycheeOrg) do not recommend the use of APP_DIR.
+# APP_DIR=
+
+# enable or disable debug bar. By default it is disabled.
+# Do note that this disable CSP!!
+DEBUGBAR_ENABLED=false
+
+# enable or disable log viewer. By default it is enabled.
+LOG_VIEWER_ENABLED=true
+
+# enable or disable clockwork. By default it is disabled (and not provided on non-dev build).
+CLOCKWORK_ENABLE=false
+
+# enable or disable latency debug: adds a specific amount of time in milliseconds to wait before processing requests.
+# Always disabled on production environment.
+# APP_DEBUG_LATENCY=0
+
+# All API requests to have the header "content-type: application/json"
+# or "content-type: multipart/form-data" depending on the type.
+#
+# If you want to disable this requirement, set this to false.
+#
+# This requirement prevents the use of the API from the API documentation page.
+REQUIRE_CONTENT_TYPE_ENABLED=true
+
+# enable s3 bucket (required in addition to needing AWS_ACCESS_KEY_ID)
+# S3_ENABLED=true
+
+# If you spread old links of to your albums in your Lychee instance starting with
+# https://lychee.text/#albumID/PhotoId
+# Set this value to true to enable redirection.
+LEGACY_V4_REDIRECT=false
+
+##############################################################################
+# IMPORTANT: To migrate from Lychee v3 you *MUST* use the same MySQL/MariaDB #
+#            server as v3.                                                   #
+##############################################################################
+
+# Table prefix (e.g. lychee_) of a Lychee v3 instance for migration
+DB_OLD_LYCHEE_PREFIX=
+
+# DB_CONNECTION can be sqlite, mysql or pgsql. For sqlite the other entries are
+# not required, but an existing sqlite3 database may be specified if desired.
+# In this case, please use an absolute path. DB_DATABASE may be omitted but should
+# *not* be left blank.
+# Note that if DB_PASSWORD includes special characters, it must be enclosed in quotes.
+# e.g. DB_PASSWORD="lychee!@#$%^&"
+DB_CONNECTION=sqlite
+DB_HOST=
+DB_PORT=
+#DB_DATABASE=
+DB_USERNAME=
+DB_PASSWORD=
+DB_LOG_SQL=false
+DB_LOG_SQL_EXPLAIN=false #only for MySQL
+
+# List foreign keys in diagnostic page
+DB_LIST_FOREIGN_KEYS=false
+
+# Application timezone. If not specified, the server's default timezone is used.
+# Requires a named timezone identifier.
+# See https://www.php.net/manual/en/timezones.php for the list of supported timezones.
+# Don't use a timezone offset (like +01:00) or a timezone abbreviation (like CEST)
+# TIMEZONE=Europe/Paris
+
+# Visibility of directories and (media) files in LYCHEE_UPLOADS
+# Possible values are:
+#
+#  - private: world group has neither read nor write access
+#  - public: world group has read access but no write access (the default)
+#  - world: world group has read and write access
+#
+# The default should suffice for most installations.
+# For improved security, change this setting to "private".
+# Some rare setups may require directories and files to be world writeable.
+# In this case, use "world" here.
+# USE WITH PRECAUTIONS: world writeable files and folders may be a SECURITY RISK.
+# LYCHEE_IMAGE_VISIBILITY=public
+
+# folders in which the files will be stored
+# LYCHEE_UPLOADS="/var/www/html/Lychee-Laravel/public/uploads/"
+# LYCHEE_DIST="/var/www/html/Lychee-Laravel/public/dist/"
+# LYCHEE_SYM="/var/www/html/Lychee-Laravel/public/sym/"
+# url to access those files
+# LYCHEE_UPLOADS_URL="uploads/"
+# LYCHEE_DIST_URL="dist/"
+# LYCHEE_SYM_URL="sym/"
+
+# Support for token based authentication used by API requests. Enabled by default.
+# ENABLE_TOKEN_AUTH=true
+
+# Lychee supports both Redis and file caching.
+# To use Redis, set CACHE_DRIVER to redis and configure the Redis connection.
+CACHE_DRIVER=file
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+# REDIS_URL=redis://<username>:<password>@<host>:<port>
+
+# If you use Redis as cache driver, we strongly recommend
+# to disable it for your Log Viewer.
+# Should redis crash, you will no longer be able to access your logs.
+LOG_VIEWER_CACHE_DRIVER=file
+
+# Session configuration
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+# `sync` if jobs needs to be executed live (default) or `database` if they can be defered.
+QUEUE_CONNECTION=sync
+
+SECURITY_HEADER_HSTS_ENABLE=false
+SECURITY_HEADER_CSP_CONNECT_SRC=
+SECURITY_HEADER_SCRIPT_SRC_ALLOW=
+SECURITY_HEADER_CSP_CHILD_SRC=
+SECURITY_HEADER_CSP_FONT_SRC=
+SECURITY_HEADER_CSP_FORM_ACTION=
+SECURITY_HEADER_CSP_FRAME_ANCESTORS=
+SECURITY_HEADER_CSP_FRAME_SRC=
+SECURITY_HEADER_CSP_IMG_SRC=
+SECURITY_HEADER_CSP_MEDIA_SRC=
+SESSION_SECURE_COOKIE=false
+
+MAIL_DRIVER=smtp
+MAIL_HOST=
+MAIL_PORT=
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=
+MAIL_FROM_NAME=
+MAIL_FROM_ADDRESS=
+
+# The trusted proxies if Lychee is behind a reverse proxy
+# Accepted values:
+#  - `null`: no proxy
+#  - `*`: any proxy
+#  - <ip address>[,<ip address>]: a comma-seperated list of IP addresses
+TRUSTED_PROXIES=null
+
+# Comma-separated list of class names of diagnostics checks that should be skipped.
+#SKIP_DIAGNOSTICS_CHECKS=
+
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+# Disable Basic Auth. This means that the only way to authenticate is via the API token or Oauth.
+# This should only be toggled AFTER having set up the admin account and bound the Oauth client.
+# DISABLE_BASIC_AUTH=false
+
+# Disable WebAuthn. This means that the only way to authenticate is via the API token, Basic Auth or Oauth.
+# DISABLE_WEBAUTHN=false
+
+# Oauth token data
+# XXX_REDIRECT_URI should be left as default unless you know exactly what you do.
+
+# AMAZON_SIGNIN_CLIENT_ID=
+# AMAZON_SIGNIN_SECRET=
+# AMAZON_SIGNIN_REDIRECT_URI=/auth/amazon/redirect
+
+# https://developer.okta.com/blog/2019/06/04/what-the-heck-is-sign-in-with-apple
+# Note: the client secret used for "Sign In with Apple" is a JWT token that can have a maximum lifetime of 6 months.
+# The article above explains how to generate the client secret on demand and you'll need to update this every 6 months.
+# To generate the client secret for each request, see Generating A Client Secret For Sign In With Apple On Each Request.
+# https://bannister.me/blog/generating-a-client-secret-for-sign-in-with-apple-on-each-request
+# APPLE_CLIENT_ID=
+# APPLE_CLIENT_SECRET=
+# APPLE_REDIRECT_URI=/auth/apple/redirect
+
+# FACEBOOK_CLIENT_ID=
+# FACEBOOK_CLIENT_SECRET=
+# FACEBOOK_REDIRECT_URI=/auth/facebook/redirect
+
+# GITHUB_CLIENT_ID=
+# GITHUB_CLIENT_SECRET=
+# GITHUB_REDIRECT_URI=/auth/github/redirect
+
+# GOOGLE_CLIENT_ID=
+# GOOGLE_CLIENT_SECRET=
+# GOOGLE_REDIRECT_URI=/auth/google/redirect
+
+# MASTODON_DOMAIN=https://mastodon.social
+# MASTODON_ID=
+# MASTODON_SECRET=
+# MASTODON_REDIRECT_URI=/auth/mastodon/redirect
+
+# MICROSOFT_CLIENT_ID=
+# MICROSOFT_CLIENT_SECRET=
+# MICROSOFT_REDIRECT_URI=/auth/microsoft/redirect
+
+# NEXTCLOUD_CLIENT_ID=
+# NEXTCLOUD_CLIENT_SECRET=
+# NEXTCLOUD_REDIRECT_URI=/auth/nextcloud/redirect
+# NEXTCLOUD_BASE_URI=
+
+# KEYCLOAK_CLIENT_ID=
+# KEYCLOAK_CLIENT_SECRET=
+# KEYCLOAK_REDIRECT_URI=/auth/keycloak/redirect
+# KEYCLOAK_BASE_URL=
+# KEYCLOAK_REALM=
+
+# AUTHENTIK_BASE_URL=
+# AUTHENTIK_CLIENT_ID=
+# AUTHENTIK_CLIENT_SECRET=
+# AUTHENTIK_REDIRECT_URI=/auth/authentik/redirect
+
+# AUTHELIA_BASE_URL=
+# AUTHELIA_CLIENT_ID=
+# AUTHELIA_CLIENT_SECRET=
+# AUTHELIA_REDIRECT_URI=/auth/authelia/redirect
+
+# AWS support data
+
+# AWS_ACCESS_KEY_ID=
+# AWS_SECRET_ACCESS_KEY=
+# AWS_DEFAULT_REGION=
+# AWS_BUCKET=
+# AWS_URL=
+# AWS_ENDPOINT=
+# AWS_IMAGE_VISIBILITY=
+# AWS_USE_PATH_STYLE_ENDPOINT=
+
+###################################################################
+# Vite local development without running a server.                #
+# set VITE_LOCAL_DEV to true                                       #
+# set VITE_HTTP_PROXY_TARGET to the rediction for the API calls.  #
+###################################################################
+# VITE_LOCAL_DEV=true
+# VITE_HTTP_PROXY_TARGET=http://localhost:8000
+
+# DISABLE_IMPORT_FROM_SERVER=false
+
+###################################################################
+# Payment integration (requires SE)                               #
+###################################################################
+
+# Enable test mode (Sandbox mode) for payment gateways.
+# In test mode, no real money transactions are done.
+# We set it to true by default for safety. Make sure to set it to false
+# when you go live.
+# OMNIPAY_TEST_MODE=true
+
+# Configuration values for Mollie integration
+# MOLLIE_API_KEY=
+# MOLLIE_PROFILE_ID=
+
+# Configuration values for Stripe integration (NOT WORKING YET, MAYBE LATER)
+# STRIPE_API_KEY=
+# STRIPE_PUBLISHABLE_KEY=
+
+# https://github.com/thephpleague/omnipay-paypal/blob/master/src/RestGateway.php
+# PAYPAL_CLIENT_ID=
+# PAYPAL_SECRET=
+
+# https://github.com/thephpleague/omnipay-paypal/blob/master/src/ExpressInContextGateway.php
+# https://github.com/thephpleague/omnipay-paypal/blob/master/src/ProGateway.php
+# PAYPAL_API_USERNAME=
+# PAYPAL_API_PASSWORD=
+# PAYPAL_API_SIGNATURE=

+ 47 - 36
lychee/lychee.yml

@@ -4,58 +4,69 @@ ARG PGID
 ARG USER
 ARG PHP_TZ
 
-FROM console:latest
+FROM alpine:latest
 
 ARG PUID
 ARG PGID
 ARG USER
 ARG PHP_TZ
 
-# Install base dependencies, add user and group, install php libraries
-RUN apt update -y
-RUN apt upgrade -qy
-RUN apt install -qy --no-install-recommends ca-certificates curl apt-transport-https
-RUN curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb 
-RUN dpkg -i /tmp/debsuryorg-archive-keyring.deb 
-RUN sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ trixie main" > /etc/apt/sources.list.d/php.list'
-RUN apt update
-RUN  apt install -qy --no-install-recommends \
-    adduser \
-    nginx-light \
-    php8.4-mysql \
-    php8.4-pgsql \
-    php8.4-sqlite3 \
-    php8.4-imagick \
-    php8.4-mbstring \
-    php8.4-gd \
-    php8.4-xml \
-    php8.4-zip \
-    php8.4-fpm \
-    php8.4-redis \
-    php8.4-bcmath \
-    php8.4-intl \
-    libimage-exiftool-perl \
-    ffmpeg \
-    jpegoptim \
-    optipng \
-    pngquant \
-    gifsicle \
-    webp \
-    unzip 
+RUN apk add bash
+RUN apk add nginx
+RUN apk add php84
+RUN apk add php84-fpm
+RUN apk add php84-mysqli
+RUN apk add php84-mysqlnd
+RUN apk add php84-sqlite3
+RUN apk add php84-pecl-imagick
+RUN apk add php84-mbstring
+RUN apk add php84-gd
+RUN apk add php84-xml
+RUN apk add php84-zip
+RUN apk add php84-fpm
+RUN apk add php84-redis
+RUN apk add php84-bcmath
+RUN apk add php84-intl
+RUN apk add php84-pdo
+RUN apk add php84-exif
+RUN apk add php84-fileinfo
+RUN apk add php84-tokenizer
+RUN apk add exiftool
+RUN apk add perl-image-exiftool 
+RUN apk add ffmpeg
+RUN apk add jpegoptim
+RUN apk add optipng
+RUN apk add pngquant
+RUN apk add gifsicle
+#RUN apk add webp
+RUN apk add unzip
+RUN apk add composer
+RUN apk add npm
+RUN apk add git
+RUN apk add php84-sodium
+RUN apk add php84-simplexml
+RUN apk add php84-dom
+RUN apk add php84-posix
+RUN apk add phpunit
+RUN apk add php84-xmlwriter
+RUN apk add php84-pdo_sqlite
+#    webp \
 
 RUN  addgroup --gid "$PGID" "$USER" 
-RUN   adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" --gid "$PGID" "$USER"
+RUN  adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" -G "$USER" "$USER"
 
 #COPY nginx.conf /etc/nginx/nginx.conf
 
 COPY start.sh /root/start.sh
 RUN chmod +x /root/start.sh
 
-RUN apt install -y git
+RUN mkdir -p /var/www/html
 RUN cd /var/www/html && git clone https://github.com/LycheeOrg/Lychee.git
-RUN apt install composer -y
 RUN cd /var/www/html/Lychee && composer install --no-dev
-RUN apt install npm -y
 RUN cd /var/www/html/Lychee && npm install && npm run build
 
+COPY env /var/www/html/Lychee/
+RUN cd /var/www/html/Lychee && php artisan key:generate 
+#RUN cd /var/www/html/Lychee && php artisan migrate
+
 CMD ["/start.sh"]

+ 5 - 1
lychee/start.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
 
 # Start PHP-FPM
-/etc/init.d/php-fpm8.4 start
+/etc/init.d/php-fpm84 start
 # Start Nginx in the foreground
 nginx -g 'daemon off;'
+echo "posizione $(pwd)"
+#touch /tmp/null
+#tail -f /tmp/null
+

+ 2 - 2
wiki/wiki.yml

@@ -1,9 +1,9 @@
 FROM debian:latest
 RUN apt update && apt dist-upgrade -y
 RUN apt install git -y
-COPY wiki/wiki.sh /root
+COPY wiki.sh /root
 RUN groupadd -g 1002 wiki
 RUN useradd -g wiki -u 1114 -s /bin/false -d /home/wiki wiki
 RUN chmod a+x /root/wiki.sh
-CMD ['/bin/bash','/root/wiki.sh']
+CMD ["/bin/bash","/root/wiki.sh"]