diff --git a/docker/y480.yaml b/docker/v2raya.yaml similarity index 67% rename from docker/y480.yaml rename to docker/v2raya.yaml index 0d89629..6f94529 100644 --- a/docker/y480.yaml +++ b/docker/v2raya.yaml @@ -1,17 +1,4 @@ services: - owss: - image: ronggang/owss:latest - container_name: owss - restart: always - privileged: true - # host 模式和 bridge 模式二选一 - network_mode: host - # ports: - # - "8088:8088" - volumes: - - /OWSS/storage:/app/storage - - /OWSS/config:/app/config - v2raya: image: mzz2017/v2raya:latest container_name: v2raya diff --git a/docker/webdav-config.yaml b/docker/webdav-config.yaml new file mode 100644 index 0000000..a8059b3 --- /dev/null +++ b/docker/webdav-config.yaml @@ -0,0 +1,36 @@ +address: 0.0.0.0 +port: 46065 +auth: true +prefix: / +tls: false +behindProxy: true +log: + format: console + colors: true + outputs: + - /logs/webdav.log +logLevel: info + +directory: /data +permissions: R + +users: + - username: zedhugh + password: "{bcrypt}$2a$10$nP6GQJidzLyhwkkQGQH/KOAQq2KjNW5Fbb.I/XD2OD2oxCxEoXbUO" + directory: /data + permissions: CRUD + + - username: PT + password: "{bcrypt}$2a$10$cK9NWvSafxne2Fv6P6ZH7.Q/tVKk5M4pqXgsuOi2bF/zsCopFHsC2" + directory: /data/users/PT + permissions: CRUD + + - username: v2rayNG + password: "{bcrypt}$2a$10$jvjejyOea8Xqsik8a9M71.rvC/0kdFah2WuMCTKHBQJ8PxGkdFmKC" + directory: /data/users/v2rayNG + permissions: CRUD + + - username: guest + password: "guest" + directory: /data/public + permissions: R diff --git a/docker/webdav.yaml b/docker/webdav.yaml new file mode 100644 index 0000000..dee4c86 --- /dev/null +++ b/docker/webdav.yaml @@ -0,0 +1,36 @@ +x-data-volume: &data-volume + type: bind + source: /var/db/webDAV + target: /data + +x-user-dirs: &user-dirs + /data/users/PT + /data/users/v2rayNG + /data/public + +services: + WebDAV-init: + image: busybox:latest + container_name: webdav-init + restart: no + volumes: + - *data-volume + environment: + DIRS: *user-dirs + command: sh -c "mkdir -p $$DIRS" + + WebDAV: + image: hacdias/webdav:latest + container_name: webdav + restart: always + depends_on: + WebDAV-init: + condition: service_completed_successfully + command: ["-c", "/config.yaml"] + network_mode: host + volumes: + - ./webdav-config.yaml:/config.yaml:ro + - /var/log:/logs + - *data-volume + environment: + TZ: Asia/Shanghai diff --git a/note/account.org.gpg b/note/account.org.gpg index 5f234c4..16d9869 100644 Binary files a/note/account.org.gpg and b/note/account.org.gpg differ