From 5a939e1bceffdc1e37886b443a9f9c376ddd6fea Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sun, 12 Dec 2021 20:15:52 +0100 Subject: [PATCH] Downloads: Update URL --- README.md | 6 +++--- docker/demo/Dockerfile | 2 +- docker/demo/README | 2 +- docker/demo/setup.sh | 10 +++++----- docker/development/Dockerfile | 8 ++++---- docker/examples/arm64/docker-compose.yml | 2 +- docker/examples/armv7/docker-compose.yml | 2 +- docker/examples/cloud/README.txt | 2 +- docker/examples/cloud/docker-compose.yml | 2 +- docker/examples/cloud/install_photoprism.sh | 4 ++-- docker/examples/cloud/setup.sh | 14 +++++++------- docker/photoprism/armv7/Dockerfile | 8 ++++---- docker/scripts/Makefile | 6 +++--- docker/scripts/install-tensorflow.sh | 6 +++--- internal/config/test.go | 2 +- internal/photoprism/faces_cluster.go | 2 +- scripts/download-facenet.sh | 2 +- scripts/download-nasnet.sh | 2 +- scripts/download-nsfw.sh | 2 +- 19 files changed, 42 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 76097925b..e1b0dc0ca 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ PhotoPrism: Browse Your Life in Pictures ======================================== [![License: AGPL](https://img.shields.io/badge/license-AGPL-blue.svg)][license] -![Build Status](https://dl.photoprism.org/img/badges/badge-build-success.svg) +![Build Status](https://dl.photoprism.app/img/badges/badge-build-success.svg) [![GitHub contributors](https://img.shields.io/github/contributors/photoprism/photoprism.svg)](https://github.com/photoprism/photoprism/graphs/contributors/) [![Documentation](https://img.shields.io/badge/read-the%20docs-4aa087.svg)][docs] [![Community Chat](https://img.shields.io/badge/chat-on%20gitter-4aa087.svg)][chat] @@ -13,7 +13,7 @@ PhotoPrism® is an AI-powered app for browsing, organizing & sharing your photo It makes use of the latest technologies to tag and find pictures automatically without getting in your way. You can run it at home, on a private server, or in the cloud. -![](https://dl.photoprism.org/img/ui/desktop-1000px.jpg) +![](https://dl.photoprism.app/img/ui/desktop-1000px.jpg) To get a first impression, you're welcome to play with our public demo at [demo.photoprism.app](https://demo.photoprism.app/). @@ -49,7 +49,7 @@ from the same repository, enjoy the exact same functionality, and can follow the after going through a short list of [requirements](https://docs.photoprism.app/getting-started/raspberry-pi/). Existing users are advised to update their `docker-compose.yml` config based on our examples -available at [dl.photoprism.org/docker/](https://dl.photoprism.org/docker/). +available at [dl.photoprism.app/docker/](https://dl.photoprism.app/docker/). ## Back us on [Patreon](https://www.patreon.com/photoprism) or [GitHub Sponsors](https://github.com/sponsors/photoprism) ## diff --git a/docker/demo/Dockerfile b/docker/demo/Dockerfile index 7d9a1f172..78ff551d5 100644 --- a/docker/demo/Dockerfile +++ b/docker/demo/Dockerfile @@ -26,7 +26,7 @@ ENV TF_CPP_MIN_LOG_LEVEL=2 \ COPY /docker/demo/index.tmpl /photoprism/assets/templates # Download example photos -RUN wget -qO- https://dl.photoprism.org/qa/demo.tar.gz | tar xvz -C /photoprism/originals +RUN wget -qO- https://dl.photoprism.app/qa/demo.tar.gz | tar xvz -C /photoprism/originals # Import example photos RUN photoprism restore -a diff --git a/docker/demo/README b/docker/demo/README index fbfaf74bf..2576d7869 100644 --- a/docker/demo/README +++ b/docker/demo/README @@ -2,7 +2,7 @@ Run to install a pre-configured demo instance on Ubuntu 20.04 LTS: - bash <(curl -s https://dl.photoprism.org/docker/demo/setup.sh) + bash <(curl -s https://dl.photoprism.app/docker/demo/setup.sh) Note: - demo.yourdomain.com must be replaced with the actual hostname diff --git a/docker/demo/setup.sh b/docker/demo/setup.sh index bf00c58ba..1f4e174e4 100755 --- a/docker/demo/setup.sh +++ b/docker/demo/setup.sh @@ -3,7 +3,7 @@ # PhotoPrism Demo Environment - Setup Script # # Usage: -# bash <(curl -s https://dl.photoprism.org/docker/demo/setup.sh) +# bash <(curl -s https://dl.photoprism.app/docker/demo/setup.sh) # # Note: # - demo.yourdomain.com must be replaced with the actual hostname @@ -82,12 +82,12 @@ mkdir -p /opt/photoprism/config /opt/photoprism/traefik PUBLIC_IP=$(curl -sfSL ifconfig.me) # download service config -COMPOSE_CONFIG=$(curl -fsSL https://dl.photoprism.org/docker/demo/docker-compose.yml) +COMPOSE_CONFIG=$(curl -fsSL https://dl.photoprism.app/docker/demo/docker-compose.yml) COMPOSE_CONFIG=${COMPOSE_CONFIG//_public_ip_/$PUBLIC_IP} echo "${COMPOSE_CONFIG}" > /opt/photoprism/docker-compose.yml -curl -fsSL https://dl.photoprism.org/docker/demo/jobs.ini > /opt/photoprism/jobs.ini -curl -fsSL https://dl.photoprism.org/docker/demo/traefik.yaml > /opt/photoprism/traefik.yaml -curl -fsSL https://dl.photoprism.org/docker/demo/Makefile > /opt/photoprism/Makefile +curl -fsSL https://dl.photoprism.app/docker/demo/jobs.ini > /opt/photoprism/jobs.ini +curl -fsSL https://dl.photoprism.app/docker/demo/traefik.yaml > /opt/photoprism/traefik.yaml +curl -fsSL https://dl.photoprism.app/docker/demo/Makefile > /opt/photoprism/Makefile # change permissions chown -Rf photoprism:photoprism /opt/photoprism diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 031b36f48..a3b35a47a 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -93,10 +93,10 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta # Download TensorFlow models & example files for testing RUN rm -rf /tmp/* && mkdir -p /tmp/photoprism && \ - wget "https://dl.photoprism.org/tensorflow/nsfw.zip?${BUILD_TAG}" -O /tmp/photoprism/nsfw.zip && \ - wget "https://dl.photoprism.org/tensorflow/nasnet.zip?${BUILD_TAG}" -O /tmp/photoprism/nasnet.zip && \ - wget "https://dl.photoprism.org/tensorflow/facenet.zip?${BUILD_TAG}" -O /tmp/photoprism/facenet.zip && \ - wget "https://dl.photoprism.org/qa/testdata.zip?${BUILD_TAG}" -O /tmp/photoprism/testdata.zip + wget "https://dl.photoprism.app/tensorflow/nsfw.zip?${BUILD_TAG}" -O /tmp/photoprism/nsfw.zip && \ + wget "https://dl.photoprism.app/tensorflow/nasnet.zip?${BUILD_TAG}" -O /tmp/photoprism/nasnet.zip && \ + wget "https://dl.photoprism.app/tensorflow/facenet.zip?${BUILD_TAG}" -O /tmp/photoprism/facenet.zip && \ + wget "https://dl.photoprism.app/qa/testdata.zip?${BUILD_TAG}" -O /tmp/photoprism/testdata.zip # Copy additional scripts to image COPY --chown=root:root /docker/scripts/heif-convert.sh /usr/local/bin/heif-convert diff --git a/docker/examples/arm64/docker-compose.yml b/docker/examples/arm64/docker-compose.yml index f35f86bdc..be6ce673e 100644 --- a/docker/examples/arm64/docker-compose.yml +++ b/docker/examples/arm64/docker-compose.yml @@ -5,7 +5,7 @@ version: '3.5' # Note: # - You have to boot your Raspberry Pi 3/4 with the parameter "arm_64bit=1" in config.txt to use our ARM64 (64-bit) image. # An "exec format error" will occur otherwise. -# - Use https://dl.photoprism.org/docker/armv7/docker-compose.yml for running PhotoPrism on ARMv7-based (32-bit) devices. +# - Use https://dl.photoprism.app/docker/armv7/docker-compose.yml for running PhotoPrism on ARMv7-based (32-bit) devices. # - Running PhotoPrism on a server with less than 4 GB of swap space or setting a memory/swap limit can cause unexpected # restarts ("crashes"), especially when the indexer temporarily needs more memory to process large files. # - If you see Docker errors related to "cgroups", it may help to add the following to /boot/firmware/cmdline.txt: diff --git a/docker/examples/armv7/docker-compose.yml b/docker/examples/armv7/docker-compose.yml index 65d2e1c58..c3a245490 100644 --- a/docker/examples/armv7/docker-compose.yml +++ b/docker/examples/armv7/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.5' # Example Docker Compose config file for PhotoPrism (ARMv7-based, 32-bit devices) # # Note: -# - Use https://dl.photoprism.org/docker/arm64/docker-compose.yml for running PhotoPrism on ARM64-based (64-bit) devices. +# - Use https://dl.photoprism.app/docker/arm64/docker-compose.yml for running PhotoPrism on ARM64-based (64-bit) devices. # - Running PhotoPrism on a server with less than 4 GB of swap space or setting a memory/swap limit can cause unexpected # restarts ("crashes"), especially when the indexer temporarily needs more memory to process large files. # - If you see Docker errors related to "cgroups", it may help to add the following to /boot/firmware/cmdline.txt: diff --git a/docker/examples/cloud/README.txt b/docker/examples/cloud/README.txt index 56f373e25..2f21545d9 100644 --- a/docker/examples/cloud/README.txt +++ b/docker/examples/cloud/README.txt @@ -17,7 +17,7 @@ GETTING STARTED Run this script as root to install PhotoPrism on a cloud server e.g. at DigitalOcean: - bash <(curl -s https://dl.photoprism.org/docker/cloud/setup.sh) + bash <(curl -s https://dl.photoprism.app/docker/cloud/setup.sh) This may take a while to complete, depending on the performance of your server and its internet connection. diff --git a/docker/examples/cloud/docker-compose.yml b/docker/examples/cloud/docker-compose.yml index 68a32f588..9d079c8cb 100644 --- a/docker/examples/cloud/docker-compose.yml +++ b/docker/examples/cloud/docker-compose.yml @@ -5,7 +5,7 @@ version: '3.5' # # Run this script as root to install PhotoPrism on a cloud server e.g. at DigitalOcean: # -# bash <(curl -s https://dl.photoprism.org/docker/cloud/setup.sh) +# bash <(curl -s https://dl.photoprism.app/docker/cloud/setup.sh) # # This may take a while to complete, depending on the performance of your # server and its internet connection. diff --git a/docker/examples/cloud/install_photoprism.sh b/docker/examples/cloud/install_photoprism.sh index 9655d54fc..264426b83 100755 --- a/docker/examples/cloud/install_photoprism.sh +++ b/docker/examples/cloud/install_photoprism.sh @@ -10,7 +10,7 @@ # so that it runs once when the server is booting for the first time: # # cd /var/lib/cloud/scripts/per-instance -# curl -fsSL https://dl.photoprism.org/docker/cloud/install_photoprism.sh > install_photoprism.sh +# curl -fsSL https://dl.photoprism.app/docker/cloud/install_photoprism.sh > install_photoprism.sh # chmod 700 install_photoprism.sh # # To create a reusable image for DigitalOcean: @@ -21,4 +21,4 @@ # # Enjoy! -bash <(curl -s https://dl.photoprism.org/docker/cloud/setup.sh) +bash <(curl -s https://dl.photoprism.app/docker/cloud/setup.sh) diff --git a/docker/examples/cloud/setup.sh b/docker/examples/cloud/setup.sh index 128f01c6a..6d5635ec9 100755 --- a/docker/examples/cloud/setup.sh +++ b/docker/examples/cloud/setup.sh @@ -62,10 +62,10 @@ mkdir -p /opt/photoprism/originals /opt/photoprism/import /opt/photoprism/storag /opt/photoprism/database /opt/photoprism/traefik /opt/photoprism/certs # download ssl config -curl -fsSL https://dl.photoprism.org/docker/cloud/certs/ca.conf > /opt/photoprism/certs/ca.conf -curl -fsSL https://dl.photoprism.org/docker/cloud/certs/cert.conf > /opt/photoprism/certs/cert.conf -curl -fsSL https://dl.photoprism.org/docker/cloud/certs/config.yml > /opt/photoprism/certs/config.yml -curl -fsSL https://dl.photoprism.org/docker/cloud/certs/openssl.conf > /opt/photoprism/certs/openssl.conf +curl -fsSL https://dl.photoprism.app/docker/cloud/certs/ca.conf > /opt/photoprism/certs/ca.conf +curl -fsSL https://dl.photoprism.app/docker/cloud/certs/cert.conf > /opt/photoprism/certs/cert.conf +curl -fsSL https://dl.photoprism.app/docker/cloud/certs/config.yml > /opt/photoprism/certs/config.yml +curl -fsSL https://dl.photoprism.app/docker/cloud/certs/openssl.conf > /opt/photoprism/certs/openssl.conf # create ca openssl genrsa -out /opt/photoprism/certs/ca.key 4096 @@ -93,12 +93,12 @@ chmod 600 /root/.initial-password.txt PUBLIC_IP=$(curl -sfSL ifconfig.me) # download service config -COMPOSE_CONFIG=$(curl -fsSL https://dl.photoprism.org/docker/cloud/docker-compose.yml) +COMPOSE_CONFIG=$(curl -fsSL https://dl.photoprism.app/docker/cloud/docker-compose.yml) COMPOSE_CONFIG=${COMPOSE_CONFIG//_public_ip_/$PUBLIC_IP} COMPOSE_CONFIG=${COMPOSE_CONFIG//$PASSWORD_PLACEHOLDER/$ADMIN_PASSWORD} echo "${COMPOSE_CONFIG}" > /opt/photoprism/docker-compose.yml -curl -fsSL https://dl.photoprism.org/docker/cloud/jobs.ini > /opt/photoprism/jobs.ini -curl -fsSL https://dl.photoprism.org/docker/cloud/traefik.yaml > /opt/photoprism/traefik.yaml +curl -fsSL https://dl.photoprism.app/docker/cloud/jobs.ini > /opt/photoprism/jobs.ini +curl -fsSL https://dl.photoprism.app/docker/cloud/traefik.yaml > /opt/photoprism/traefik.yaml # change permissions chown -Rf photoprism:photoprism /opt/photoprism diff --git a/docker/photoprism/armv7/Dockerfile b/docker/photoprism/armv7/Dockerfile index 6160ef1cd..d972a18c3 100644 --- a/docker/photoprism/armv7/Dockerfile +++ b/docker/photoprism/armv7/Dockerfile @@ -87,10 +87,10 @@ RUN apt-get update && apt-get -qq dist-upgrade && apt-get -qq install --no-insta # Download TensorFlow models & example files for testing RUN rm -rf /tmp/* && mkdir -p /tmp/photoprism && \ - wget "https://dl.photoprism.org/tensorflow/nsfw.zip?${BUILD_TAG}" -O /tmp/photoprism/nsfw.zip && \ - wget "https://dl.photoprism.org/tensorflow/nasnet.zip?${BUILD_TAG}" -O /tmp/photoprism/nasnet.zip && \ - wget "https://dl.photoprism.org/tensorflow/facenet.zip?${BUILD_TAG}" -O /tmp/photoprism/facenet.zip && \ - wget "https://dl.photoprism.org/qa/testdata.zip?${BUILD_TAG}" -O /tmp/photoprism/testdata.zip + wget "https://dl.photoprism.app/tensorflow/nsfw.zip?${BUILD_TAG}" -O /tmp/photoprism/nsfw.zip && \ + wget "https://dl.photoprism.app/tensorflow/nasnet.zip?${BUILD_TAG}" -O /tmp/photoprism/nasnet.zip && \ + wget "https://dl.photoprism.app/tensorflow/facenet.zip?${BUILD_TAG}" -O /tmp/photoprism/facenet.zip && \ + wget "https://dl.photoprism.app/qa/testdata.zip?${BUILD_TAG}" -O /tmp/photoprism/testdata.zip # Copy additional scripts to image COPY --chown=root:root /docker/scripts/heif-convert.sh /usr/local/bin/heif-convert diff --git a/docker/scripts/Makefile b/docker/scripts/Makefile index 6d52d3c4a..c3cdd434b 100644 --- a/docker/scripts/Makefile +++ b/docker/scripts/Makefile @@ -19,17 +19,17 @@ apt-cleanup: install-intel-graphics: apt-get install intel-opencl-icd intel-media-va-driver-non-free i965-va-driver-shaders libmfx1 /tmp/libtensorflow-linux-cpu-1.15.2.tar.gz: - curl -fsSL "https://dl.photoprism.org/tensorflow/linux/libtensorflow-linux-cpu-1.15.2.tar.gz" > /tmp/libtensorflow-linux-cpu-1.15.2.tar.gz + curl -fsSL "https://dl.photoprism.app/tensorflow/linux/libtensorflow-linux-cpu-1.15.2.tar.gz" > /tmp/libtensorflow-linux-cpu-1.15.2.tar.gz tensorflow-amd64-cpu-install: tar --overwrite -C "/usr" -xzf /tmp/libtensorflow-linux-cpu-1.15.2.tar.gz ldconfig /tmp/libtensorflow-linux-avx-1.15.2.tar.gz: - curl -fsSL "https://dl.photoprism.org/tensorflow/linux/libtensorflow-linux-avx-1.15.2.tar.gz" > /tmp/libtensorflow-linux-avx-1.15.2.tar.gz + curl -fsSL "https://dl.photoprism.app/tensorflow/linux/libtensorflow-linux-avx-1.15.2.tar.gz" > /tmp/libtensorflow-linux-avx-1.15.2.tar.gz tensorflow-amd64-avx-install: tar --overwrite -C "/usr" -xzf /tmp/libtensorflow-linux-avx-1.15.2.tar.gz ldconfig /tmp/libtensorflow-linux-avx2-1.15.2.tar.gz: - curl -fsSL "https://dl.photoprism.org/tensorflow/linux/libtensorflow-linux-avx2-1.15.2.tar.gz" > /tmp/libtensorflow-linux-avx2-1.15.2.tar.gz + curl -fsSL "https://dl.photoprism.app/tensorflow/linux/libtensorflow-linux-avx2-1.15.2.tar.gz" > /tmp/libtensorflow-linux-avx2-1.15.2.tar.gz tensorflow-amd64-avx2-install: tar --overwrite -C "/usr" -xzf /tmp/libtensorflow-linux-avx2-1.15.2.tar.gz ldconfig diff --git a/docker/scripts/install-tensorflow.sh b/docker/scripts/install-tensorflow.sh index d943d1ecf..48b22ad6b 100755 --- a/docker/scripts/install-tensorflow.sh +++ b/docker/scripts/install-tensorflow.sh @@ -8,11 +8,11 @@ else if [[ $1 == "amd64" ]]; then TARGETARCH="linux" TARGETVARIANT="-${2:-"cpu"}" - URL="https://dl.photoprism.org/tensorflow/$TARGETARCH/libtensorflow-${TARGETARCH}${TARGETVARIANT}-1.15.2.tar.gz" + URL="https://dl.photoprism.app/tensorflow/$TARGETARCH/libtensorflow-${TARGETARCH}${TARGETVARIANT}-1.15.2.tar.gz" elif [[ $1 == "arm64" ]]; then - URL="https://dl.photoprism.org/tensorflow/$1/libtensorflow-$1-1.15.2.tar.gz" + URL="https://dl.photoprism.app/tensorflow/$1/libtensorflow-$1-1.15.2.tar.gz" elif [[ $1 == "arm" ]]; then - URL="https://dl.photoprism.org/tensorflow/$1/libtensorflow-$1-1.15.2.tar.gz" + URL="https://dl.photoprism.app/tensorflow/$1/libtensorflow-$1-1.15.2.tar.gz" else echo "cpu architecture not supported by now" 1>&2 exit 1 diff --git a/internal/config/test.go b/internal/config/test.go index 7bec460b3..bb52d079d 100644 --- a/internal/config/test.go +++ b/internal/config/test.go @@ -21,7 +21,7 @@ import ( // Download URL and ZIP hash for test files. const ( TestDataZip = "/tmp/photoprism/testdata.zip" - TestDataURL = "https://dl.photoprism.org/qa/testdata.zip" + TestDataURL = "https://dl.photoprism.app/qa/testdata.zip" TestDataHash = "be394d5bee8a5634d415e9e0663eef20b5604510" // sha1sum ) diff --git a/internal/photoprism/faces_cluster.go b/internal/photoprism/faces_cluster.go index 0e52ab7ca..2b442fa8a 100644 --- a/internal/photoprism/faces_cluster.go +++ b/internal/photoprism/faces_cluster.go @@ -39,7 +39,7 @@ func (w *Faces) Cluster(opt FacesOptions) (added entity.Faces, err error) { } else { var c clusters.HardClusterer - // See https://dl.photoprism.org/research/ for research on face clustering algorithms. + // See https://dl.photoprism.app/research/ for research on face clustering algorithms. if c, err = clusters.DBSCAN(face.ClusterCore, face.ClusterDist, w.conf.Workers(), clusters.EuclideanDistance); err != nil { return added, err } else if err = c.Learn(embeddings.Float64()); err != nil { diff --git a/scripts/download-facenet.sh b/scripts/download-facenet.sh index 9040af8c2..6e00dae50 100755 --- a/scripts/download-facenet.sh +++ b/scripts/download-facenet.sh @@ -3,7 +3,7 @@ TODAY=`date -u +%Y%m%d` MODEL_NAME="Facenet" -MODEL_URL="https://dl.photoprism.org/tensorflow/facenet.zip?$TODAY" +MODEL_URL="https://dl.photoprism.app/tensorflow/facenet.zip?$TODAY" MODEL_PATH="assets/facenet" MODEL_ZIP="/tmp/photoprism/facenet.zip" MODEL_HASH="0492eb1d67789108b7eefb274e26633504b059be $MODEL_ZIP" diff --git a/scripts/download-nasnet.sh b/scripts/download-nasnet.sh index c21c37e11..2fea8fbac 100755 --- a/scripts/download-nasnet.sh +++ b/scripts/download-nasnet.sh @@ -3,7 +3,7 @@ TODAY=`date -u +%Y%m%d` MODEL_NAME="NASNet Mobile" -MODEL_URL="https://dl.photoprism.org/tensorflow/nasnet.zip?$TODAY" +MODEL_URL="https://dl.photoprism.app/tensorflow/nasnet.zip?$TODAY" MODEL_PATH="assets/nasnet" MODEL_ZIP="/tmp/photoprism/nasnet.zip" MODEL_HASH="f18b801354e95cade497b4f12e8d2537d04c04f6 $MODEL_ZIP" diff --git a/scripts/download-nsfw.sh b/scripts/download-nsfw.sh index 59b16125e..02d114b64 100755 --- a/scripts/download-nsfw.sh +++ b/scripts/download-nsfw.sh @@ -3,7 +3,7 @@ TODAY=`date -u +%Y%m%d` MODEL_NAME="NSFW" -MODEL_URL="https://dl.photoprism.org/tensorflow/nsfw.zip?$TODAY" +MODEL_URL="https://dl.photoprism.app/tensorflow/nsfw.zip?$TODAY" MODEL_PATH="assets/nsfw" MODEL_ZIP="/tmp/photoprism/nsfw.zip" MODEL_HASH="2e03ad3c6aec27c270c650d0574ff2a6291d992b $MODEL_ZIP"