From 5e96c59fc63a61791de6da3fc5e30691d185a965 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:12:32 -0700 Subject: [PATCH 1/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46d1ede6..84a0abc6 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Ansible config and a bunch of Docker containers. * [Airsonic](https://airsonic.github.io/) - catalog and stream music * [Bazarr](https://github.com/morpheus65535/bazarr) - companion to Radarr and Sonarr for downloading subtitles * [Bitwarden_rs](https://github.com/dani-garcia/bitwarden_rs) - Self-Hosting port of password manager -* [Calibre](https://hub.docker.com/r/linuxserver/calibre-web) - eBook Library +* [Calibre-web](https://hub.docker.com/r/linuxserver/calibre-web) - Provides a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. * [Cloud Commander](https://cloudcmd.io/) - A dual panel file manager with integrated web console and text editor * [Cloudflare DDNS](https://hub.docker.com/r/joshuaavalon/cloudflare-ddns/) - automatically update Cloudflare with your IP address * [CouchPotato](https://couchpota.to/) - for downloading and managing movies From 67d93f24c6df24e11bba9364c7e05a461d979cde Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:13:45 -0700 Subject: [PATCH 2/9] fix heading --- docs/applications/calibre.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/applications/calibre.md b/docs/applications/calibre.md index afef056d..04fc770e 100644 --- a/docs/applications/calibre.md +++ b/docs/applications/calibre.md @@ -1,4 +1,4 @@ -# Calibre(-web) eBook Library +# Calibre-web Homepage: [https://github.com/janeczku/calibre-web](https://github.com/linuxserver/docker-calibre-web) From 6ae6564109653cf530d19e953c9241d7d38c632f Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:16:58 -0700 Subject: [PATCH 3/9] fixed links [] link pointed to docker image but () linked to app site, app site is more appropriate and should rule over the docker image (Though I'd like to add all docker images' links to all the docs) --- docs/applications/calibre.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/applications/calibre.md b/docs/applications/calibre.md index 04fc770e..8fff5e07 100644 --- a/docs/applications/calibre.md +++ b/docs/applications/calibre.md @@ -1,6 +1,6 @@ # Calibre-web -Homepage: [https://github.com/janeczku/calibre-web](https://github.com/linuxserver/docker-calibre-web) +Homepage: [https://github.com/linuxserver/docker-calibre-web](https://github.com/linuxserver/docker-calibre-web) Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. From 86efca8d70f53117fbc2611456ac8bae688d1501 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:17:42 -0700 Subject: [PATCH 4/9] Ooops - fixed reversed links from what I stated --- docs/applications/calibre.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/applications/calibre.md b/docs/applications/calibre.md index 8fff5e07..03b5dc1a 100644 --- a/docs/applications/calibre.md +++ b/docs/applications/calibre.md @@ -1,6 +1,6 @@ # Calibre-web -Homepage: [https://github.com/linuxserver/docker-calibre-web](https://github.com/linuxserver/docker-calibre-web) +Homepage: [https://github.com/janeczku/calibre-web](https://github.com/janeczku/calibre-web) Calibre-Web is a web app providing a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. From eb79d5b7f34aae5fdb172938cf0dd87ffe929e3e Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:20:25 -0700 Subject: [PATCH 5/9] Calibre -> Calibre-web name correction --- docs/configuration/application_ports.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration/application_ports.md b/docs/configuration/application_ports.md index ee55150e..4d06c77c 100644 --- a/docs/configuration/application_ports.md +++ b/docs/configuration/application_ports.md @@ -8,7 +8,7 @@ By default, applications can be found on the ports listed below. | Bazarr | 6767 | | | Bitwarden "hub" | 3012 | Web Not. | | Bitwarden | 19080 | HTTP | -| Calibre | 8084 | HTTP | +| Calibre-web | 8084 | HTTP | | Cloud Commander | 7373 | | | Couchpotato | 5050 | | | Duplicati | 8200 | | From 8345a456397758e0e8ec75e48282b5bf0c8ff13b Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:21:12 -0700 Subject: [PATCH 6/9] Calibre -> Calibre-web name correction --- tasks/calibre.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/calibre.yml b/tasks/calibre.yml index 321fe00d..e597f473 100644 --- a/tasks/calibre.yml +++ b/tasks/calibre.yml @@ -1,11 +1,11 @@ -- name: Create Calibre Directories +- name: Create Calibre-web Directories file: path: "{{ item }}" state: directory with_items: - "{{ calibre_data_directory }}/config" -- name: Calibre Docker Container +- name: Calibre-web Docker Container docker_container: name: calibre image: linuxserver/calibre-web:latest @@ -26,4 +26,4 @@ traefik.frontend.rule: "Host:calibre.{{ ansible_nas_domain }}" traefik.enable: "{{ calibre_available_externally }}" traefik.port: "8083" - memory: 1g \ No newline at end of file + memory: 1g From c194e67c12cd893ee006492d1267b3b504d92c54 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:22:04 -0700 Subject: [PATCH 7/9] Calibre -> Calibre-web name correction --- group_vars/all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 3bcf3f92..95704dec 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -755,7 +755,7 @@ mosquitto_port_a: "1883" mosquitto_port_b: "9001" ### -### Calibre +### Calibre-web ### calibre_available_externally: "false" calibre_data_directory: "{{ docker_home }}/calibre" From 4a2d519eba50fcdc33055e08a9a9cba1511445e7 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:26:20 -0700 Subject: [PATCH 8/9] fix link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 84a0abc6..7b22fc04 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Ansible config and a bunch of Docker containers. * [Airsonic](https://airsonic.github.io/) - catalog and stream music * [Bazarr](https://github.com/morpheus65535/bazarr) - companion to Radarr and Sonarr for downloading subtitles * [Bitwarden_rs](https://github.com/dani-garcia/bitwarden_rs) - Self-Hosting port of password manager -* [Calibre-web](https://hub.docker.com/r/linuxserver/calibre-web) - Provides a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. +* [Calibre-web](https://github.com/janeczku/calibre-web) - Provides a clean interface for browsing, reading and downloading eBooks using an existing Calibre database. * [Cloud Commander](https://cloudcmd.io/) - A dual panel file manager with integrated web console and text editor * [Cloudflare DDNS](https://hub.docker.com/r/joshuaavalon/cloudflare-ddns/) - automatically update Cloudflare with your IP address * [CouchPotato](https://couchpota.to/) - for downloading and managing movies From d3390973372ce217826835d807a4c77797242bb6 Mon Sep 17 00:00:00 2001 From: bcurran3 Date: Sat, 25 Apr 2020 18:30:30 -0700 Subject: [PATCH 9/9] one more correction --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b22fc04..e9b5cb7a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Ansible config and a bunch of Docker containers. * A Docker host with Portainer for image and container management * An automatic dynamic DNS updater if you use Cloudflare to host your domain DNS * A Personal finance manager -* eBook management with calibre-web +* eBook management with Calibre-web * Content management with Joomla * A dual panel local file manager * Self-service media request web application