diff --git a/compose/adguard/docker-compose.yml b/compose/adguard/docker-compose.yml index 5185214..343aabd 100644 --- a/compose/adguard/docker-compose.yml +++ b/compose/adguard/docker-compose.yml @@ -31,20 +31,7 @@ services: - homepage.widget.password=P@@fml123 networks: - tnet - backup: - image: offen/docker-volume-backup:latest - restart: always - volumes: - # volumes to backup. - - adguard-workdir:/backup/adguard-workdir:ro - - adguard-confdir:/backup/adguard-confdir:ro - - /mnt/backup/docker/esh-vm-docker/adguard:/archive - # can omit below if not stopping service. - # - /var/run/docker.sock:/var/run/docker.sock:ro - env_file: - - .env - networks: - - tnet + volumes: adguard-workdir: null adguard-confdir: null diff --git a/compose/calibre-web/compose.yaml b/compose/calibre-web/compose.yaml new file mode 100644 index 0000000..f9c342c --- /dev/null +++ b/compose/calibre-web/compose.yaml @@ -0,0 +1,23 @@ +services: + calibre-web: + image: lscr.io/linuxserver/calibre-web:latest + container_name: calibre-web + environment: + - PUID=2000 + - PGID=2000 + - TZ=Etc/UTC + - DOCKER_MODS=linuxserver/mods:universal-calibre #optional + - OAUTHLIB_RELAX_TOKEN_SCOPE=1 #optional + volumes: + - /opt/docker/conf/calibre-web:/config + - /mnt/books/calibre/calibre_library:/books + labels: + - homepage.group=Media + - homepage.name=Calibre-Web + - homepage.icon=si-calibreweb + - homepage.description=EBook Server (esh) + - homepage.href=http://10.0.50.45:8083 + ports: + - 8083:8083 + restart: unless-stopped +networks: {} diff --git a/compose/calibre/compose.yaml b/compose/calibre/compose.yaml index ee6ddb1..12f2fc0 100644 --- a/compose/calibre/compose.yaml +++ b/compose/calibre/compose.yaml @@ -6,8 +6,8 @@ services: security_opt: - seccomp:unconfined #optional environment: - - PUID=1000 - - PGID=1000 + - PUID=2000 + - PGID=2000 - TZ=America/Los_Angeles - PASSWORD= #optional - CLI_ARGS= #optional diff --git a/compose/dockge/compose.yaml b/compose/dockge/compose.yaml index d88784c..41d8727 100644 --- a/compose/dockge/compose.yaml +++ b/compose/dockge/compose.yaml @@ -20,19 +20,7 @@ services: - DOCKGE_STACKS_DIR=/opt/docker/compose networks: - tnet - backup: - image: offen/docker-volume-backup:latest - restart: always - volumes: - # volumes to backup. - - dockge_data:/backup/dockge:ro - - /mnt/backup/docker/esh-vm-docker/dockge:/archive - # can omit below if not stopping service. - # - /var/run/docker.sock:/var/run/docker.sock:ro - env_file: - - .env - networks: - - tnet + volumes: dockge_data: null networks: diff --git a/compose/homepage/compose.yaml b/compose/homepage/compose.yaml index 82a0484..eff98a6 100644 --- a/compose/homepage/compose.yaml +++ b/compose/homepage/compose.yaml @@ -16,7 +16,7 @@ services: - tnet labels: - traefik.enable=true - - traefik.http.routers.homepage.rule=host(`10.0.50.45`) + - traefik.http.routers.homepage.rule=host(`eshhome`) - traefik.http.services.homepage.loadbalancer.server.port=3000 - traefik.http.routers.homepage.priority=1 networks: diff --git a/conf/calibre-web/.CALIBRE_RELEASE b/conf/calibre-web/.CALIBRE_RELEASE new file mode 100644 index 0000000..3604e85 --- /dev/null +++ b/conf/calibre-web/.CALIBRE_RELEASE @@ -0,0 +1 @@ +v7.12.0 diff --git a/conf/calibre-web/.key b/conf/calibre-web/.key new file mode 100644 index 0000000..159ee93 --- /dev/null +++ b/conf/calibre-web/.key @@ -0,0 +1 @@ +4cmGYSmUwGmiiS5AX8RYW0JsWiqOstTJ-rkmBgF8DcI= \ No newline at end of file diff --git a/conf/calibre-web/app.db b/conf/calibre-web/app.db new file mode 100644 index 0000000..e430745 Binary files /dev/null and b/conf/calibre-web/app.db differ diff --git a/conf/calibre-web/calibre-web.log b/conf/calibre-web/calibre-web.log new file mode 100644 index 0000000..b609876 --- /dev/null +++ b/conf/calibre-web/calibre-web.log @@ -0,0 +1,82 @@ +[2024-06-19 04:26:48,129] WARN {cps.config_sql:352} Log path /config/calibre-web.log not valid, falling back to default +[2024-06-19 04:26:48,138] WARN {cps.config_sql:352} Log path not valid, falling back to default +[2024-06-19 04:26:48,140] WARN {cps.config_sql:388} invalidating configuration +[2024-06-19 04:26:48,140] WARN {cps.config_sql:352} Log path not valid, falling back to default +[2024-06-19 04:26:48,155] INFO {cps:177} Starting Calibre Web... +[2024-06-19 04:26:48,368] WARN {py.warnings:109} /lsiopy/lib/python3.10/site-packages/flask_limiter/extension.py:308: UserWarning: Using the in-memory storage for tracking rate limits as no storage was explicitly specified. This is not recommended for production use. See: https://flask-limiter.readthedocs.io#configuring-a-storage-backend for documentation about configuring the storage backend. + warnings.warn( + +[2024-06-19 04:26:48,496] INFO {apscheduler.scheduler:181} Scheduler started +[2024-06-19 04:26:48,497] INFO {apscheduler.scheduler:895} Added job "end scheduled task" to job store "default" +[2024-06-19 04:26:48,576] INFO {cps.ub:911} github Blueprint Created +[2024-06-19 04:26:48,580] INFO {cps.ub:911} google Blueprint Created +[2024-06-19 04:26:49,525] INFO {cps.server:207} Starting Gevent server on [::]:8083 +[2024-06-19 04:34:57,997] WARN {cps.config_sql:352} Log path not valid, falling back to default +[2024-06-19 04:34:58,002] WARN {cps.config_sql:352} Log path not valid, falling back to default +[2024-06-19 04:35:00,683] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 04:35:32,808] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 04:37:19,630] INFO {cps.server:284} webserver stop (restart=False) +[2024-06-19 04:37:19,630] INFO {apscheduler.scheduler:212} Scheduler has been shut down +[2024-06-19 04:37:20,632] INFO {cps.server:262} Performing shutdown of Calibre-Web +[2024-06-19 04:39:25,214] WARN {cps.config_sql:352} Log path not valid, falling back to default +[2024-06-19 04:39:25,231] INFO {cps:177} Starting Calibre Web... +[2024-06-19 04:39:25,488] WARN {py.warnings:109} /lsiopy/lib/python3.10/site-packages/flask_limiter/extension.py:308: UserWarning: Using the in-memory storage for tracking rate limits as no storage was explicitly specified. This is not recommended for production use. See: https://flask-limiter.readthedocs.io#configuring-a-storage-backend for documentation about configuring the storage backend. + warnings.warn( + +[2024-06-19 04:39:25,601] INFO {apscheduler.scheduler:181} Scheduler started +[2024-06-19 04:39:25,601] INFO {apscheduler.scheduler:895} Added job "end scheduled task" to job store "default" +[2024-06-19 04:39:26,472] INFO {cps.server:207} Starting Gevent server on [::]:8083 +[2024-06-19 04:39:37,058] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 04:39:48,110] INFO {cps.web:1207} Serving book: A History of the World in Twelve Shipwreck - David Gibbins +[2024-06-19 04:40:22,012] INFO {cps.web:1207} Serving book: The Big Time - Fritz Leiber +[2024-06-19 04:40:43,891] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 04:40:56,488] INFO {cps.admin:1500} Update status requested +[2024-06-19 04:41:20,328] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 04:41:22,000] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 04:42:34,974] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 04:47:38,958] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:07:32,911] ERROR {cps.db:867} Author James Islington not found to display name in right order +[2024-06-19 05:07:32,925] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:07:34,241] ERROR {cps.db:867} Author James Islington not found to display name in right order +[2024-06-19 05:07:34,253] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:08:08,819] ERROR {cps.db:867} Author James Islington not found to display name in right order +[2024-06-19 05:08:08,831] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:08:11,096] ERROR {cps.db:867} Author James Islington not found to display name in right order +[2024-06-19 05:08:12,653] ERROR {cps.db:867} Author James Islington not found to display name in right order +[2024-06-19 05:08:22,912] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 +[2024-06-19 05:08:29,241] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:08:43,368] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 +[2024-06-19 05:08:48,944] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:08:49,022] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 +[2024-06-19 05:08:50,952] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:08:53,772] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 +[2024-06-19 05:08:55,829] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:09:13,953] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 +[2024-06-19 05:09:20,135] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Light%20of%20All%20That%20Falls&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:09:46,364] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:09:56,158] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20Of%20What%20Was%20Lost%20%2528Book%201%2529&as_vis=0&as_sdt=0,33 +[2024-06-19 05:10:02,442] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20Of%20What%20Was%20Lost%20%2528Book%201%2529&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:21:08,009] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20of%20What%20Was%20Lost&as_vis=0&as_sdt=0,33 +[2024-06-19 05:21:13,344] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20of%20What%20Was%20Lost&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:21:23,652] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20of%20What%20Was%20Lost&as_vis=0&as_sdt=0,33 +[2024-06-19 05:21:29,621] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20of%20What%20Was%20Lost&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:21:44,566] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:22:43,315] INFO {scholarly:96} Getting https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20of%20What%20Was%20Lost&as_vis=0&as_sdt=0,33 +[2024-06-19 05:22:49,537] INFO {httpx:1026} HTTP Request: GET https://scholar.google.com/scholar?hl=en&q=The%20Shadow%20of%20What%20Was%20Lost&as_vis=0&as_sdt=0,33 "HTTP/1.1 200 OK" +[2024-06-19 05:31:13,740] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:31:22,658] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-19 05:57:20,317] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-20 02:16:38,762] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-20 02:16:47,925] INFO {cps.helper:962} Downloading file: /books/Cameron Gunn/Ben & Me (17)/Ben & Me - Cameron Gunn.epub +[2024-06-20 02:16:52,815] INFO {cps.helper:962} Downloading file: /books/David Gibbins/A History of the World in Twelve Shipwrecks (16)/A History of the World in Twelve Shipwreck - David Gibbins.epub +[2024-06-20 02:16:56,310] INFO {cps.helper:962} Downloading file: /books/Victor G. Kiernan;/European Empires From Conquest to Collapse, 1815-1960 (15)/European Empires From Conquest to Collapse - Victor G. Kiernan;.epub +[2024-06-20 02:16:58,751] INFO {cps.helper:962} Downloading file: /books/Doris Kearns Goodwin/An Unfinished Love Story_ A Personal History of the 1960s (14)/An Unfinished Love Story_ A Personal Histo - Doris Kearns Goodwin.epub +[2024-06-20 02:16:59,986] ERROR {cps.db:867} Author Kagan, Robert not found to display name in right order +[2024-06-20 02:17:01,214] INFO {cps.helper:962} Downloading file: /books/Robert Kagan;/The Ghost at the Feast_ America and the Collapse of World Order, 1900-1941 (13)/The Ghost at the Feast_ America and the Co - Robert Kagan;.epub +[2024-06-20 02:17:03,777] INFO {cps.helper:962} Downloading file: /books/Steven Johnson/The Infernal Machine_ A True Story of Dynamite, Terror, and the Rise of the Modern Detective (12)/The Infernal Machine_ A True Story of Dyna - Steven Johnson.epub +[2024-06-20 02:17:06,958] INFO {cps.helper:962} Downloading file: /books/Stewart Gordon/A History of the World in Sixteen Shipwrecks (11)/A History of the World in Sixteen Shipwrec - Stewart Gordon.epub +[2024-06-20 02:17:10,097] INFO {cps.helper:962} Downloading file: /books/Emmanuel Acho/Uncomfortable Conversations with a Jew (10)/Uncomfortable Conversations with a Jew - Emmanuel Acho.epub +[2024-06-20 04:10:00,013] INFO {apscheduler.executors.default:123} Running job "end scheduled task (trigger: cron[hour='4', minute='10'], next run at: 2024-06-21 04:10:00 UTC)" (scheduled at 2024-06-20 04:10:00+00:00) +[2024-06-20 04:10:00,014] INFO {apscheduler.executors.default:144} Job "end scheduled task (trigger: cron[hour='4', minute='10'], next run at: 2024-06-21 04:10:00 UTC)" executed successfully +[2024-06-21 04:10:00,000] INFO {apscheduler.executors.default:123} Running job "end scheduled task (trigger: cron[hour='4', minute='10'], next run at: 2024-06-22 04:10:00 UTC)" (scheduled at 2024-06-21 04:10:00+00:00) +[2024-06-21 04:10:00,002] INFO {apscheduler.executors.default:144} Job "end scheduled task (trigger: cron[hour='4', minute='10'], next run at: 2024-06-22 04:10:00 UTC)" executed successfully diff --git a/conf/calibre-web/client_secrets.json b/conf/calibre-web/client_secrets.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/conf/calibre-web/client_secrets.json @@ -0,0 +1 @@ +{} diff --git a/conf/calibre-web/gdrive.db b/conf/calibre-web/gdrive.db new file mode 100644 index 0000000..22fbcee Binary files /dev/null and b/conf/calibre-web/gdrive.db differ diff --git a/conf/homepage/settings.yaml b/conf/homepage/settings.yaml index c7350b7..8e2e8fb 100755 --- a/conf/homepage/settings.yaml +++ b/conf/homepage/settings.yaml @@ -30,7 +30,7 @@ layout: Apps: UltraSeedbox: style: row - columns: 4 + columns: 3 ESH: PFI-ANA: PFI-NH3: