From f6cdfe329e8507108486822155415fa8d071bf72 Mon Sep 17 00:00:00 2001 From: geezo Date: Fri, 27 Dec 2024 23:58:07 +0000 Subject: [PATCH] chnage --- autorestic/autorestic.yaml | 12 +- autorestic/config.yaml | 48 ++-- glance/docker-compose.yml | 10 + glance/glance.yml | 340 +++++++++++++++++++++++++++ hastebin/docker-compose.yml | 15 ++ hoarder/docker-compose.yml | 2 +- nextcloud/docker-compose.yml | 6 +- olivetin/{config.yml => config.yaml} | 0 olivetin/docker-compose.yml | 9 + 9 files changed, 403 insertions(+), 39 deletions(-) create mode 100644 glance/docker-compose.yml create mode 100644 glance/glance.yml create mode 100644 hastebin/docker-compose.yml rename olivetin/{config.yml => config.yaml} (100%) create mode 100644 olivetin/docker-compose.yml diff --git a/autorestic/autorestic.yaml b/autorestic/autorestic.yaml index feaf1bd..0b40f2c 100644 --- a/autorestic/autorestic.yaml +++ b/autorestic/autorestic.yaml @@ -8,11 +8,11 @@ backends: AWS_ACCESS_KEY_ID: AKIA4XIDYLVKXZWMVHWI AWS_SECRET_ACCESS_KEY: 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 -location: - hoarder_meilisearch_data: - from: hoarder_meilisearch_data - type: volume - to: - - aws_s3 +# location: +# hoarder_meilisearch_data: +# from: hoarder_meilisearch_data +# type: volume +# to: +# - aws_s3 diff --git a/autorestic/config.yaml b/autorestic/config.yaml index cc77d1d..e677f7f 100644 --- a/autorestic/config.yaml +++ b/autorestic/config.yaml @@ -20,50 +20,38 @@ locations: type: volume to: - aws_s3 - gitea_stack_gitea: - from: gitea_stack_gitea + gitea_gitea_data: + from: gitea_gitea_data type: volume to: - aws_s3 - gitea_stack_postgres: - from: gitea_stack_postgres + gitea_postgres_data: + from: gitea_postgres_data type: volume to: - aws_s3 - nextcloud: - from: nextcloud + navidrome_navidrome_data: + from: navidrome_navidrome_data type: volume to: - aws_s3 - homebridge: - from: homebridge - type: volume - to: - - aws_s3 + # nextcloud_nextcloud_aio_data: + # from: nextcloud_nextcloud_aio_data + # type: volume + # to: + # - aws_s3 - homarr: - from: homarr - type: volume - to: - - aws_s3 + # nextcloud_nextcloud_aio_mastercontainer: + # from: nextcloud_nextcloud_aio_mastercontainer + # type: volume + # to: + # - aws_s3 - immich: - from: immich_model-cache - type: volume - to: - - aws_s3 - - memos: - from: memos - type: volume - to: - - aws_s3 - - portainer: - from: portainer_data + portainer_portainer_data: + from: portainer_portainer_data type: volume to: - aws_s3 diff --git a/glance/docker-compose.yml b/glance/docker-compose.yml new file mode 100644 index 0000000..ead33f2 --- /dev/null +++ b/glance/docker-compose.yml @@ -0,0 +1,10 @@ +services: + glance: + image: glanceapp/glance + volumes: + - ./glance.yml:/app/glance.yml + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + ports: + - 1005:8080 + restart: unless-stopped \ No newline at end of file diff --git a/glance/glance.yml b/glance/glance.yml new file mode 100644 index 0000000..71dbd2c --- /dev/null +++ b/glance/glance.yml @@ -0,0 +1,340 @@ +theme: + background-color: 225 14 15 + primary-color: 157 47 65 + contrast-multiplier: 1.1 + +pages: + - name: Startpage + #hide-desktop-navigation: true + center-vertically: true + columns: + - size: full + widgets: + - type: search + autofocus: true + + - type: monitor + cache: 1m + title: Services + sites: + - title: Hoarder + url: "http://theocorp:1004" + icon: si:gitea + - title: Git + url: "http://192.168.1.119:8123" + icon: si:homeassistant + - title: Portainer + url: "http://theocorp:1000" + icon: si:portainer + - title: Navidrome + url: "http://theocorp:1002" + icon: si:applemusic + - title: Olive Tin + url: "http://theocorp:1004" + icon: si:applemusic + - type: bookmarks + groups: + - title: General + links: + - title: Gmail + url: https://mail.google.com/mail/u/0/ + - title: Amazon + url: https://www.amazon.com/ + - title: Github + url: https://github.com/ + - title: 3rd Party Services + links: + - title: Cloudflare + url: https://example.com + - title: AWS + url: https://example.com + - title: ETC + url: https://example.com + - title: Adulting + links: + - title: Mortgage + url: https://example.com + - title: Electric + url: https://example.com + - title: Schwab + url: https://example.com + - title: Fidelity + url: https://example.com + + + - name: Technology + columns: + - size: small + widgets: + - type: calendar + - type: releases + show-source-icon: true + repositories: + - hoarder-app/hoarder + - glanceapp/glance + - neosmemo/memos + + - type: hacker-news + limit: 15 + collapse-after: 5 + - size: full + widgets: + ###Self Hosted / Home automation + - type: videos + channels: + - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling + - UCv6J_jJa8GJqFwQNgNrMuww # ServeTheHome + - UCOk-gHyjcWZNj3Br4oxwh0A # Techno Tim + - type: group + widgets: + - type: reddit + subreddit: selfhosted + show-thumbnails: true + - type: reddit + subreddit: homeassistant + show-thumbnails: true + - type: reddit + subreddit: homeautomation + show-thumbnails: true + - type: reddit + subreddit: sideproject + show-thumbnails: true + #### Development/Coding + - type: videos + channels: + - UC9x0AN7BWHpCDHSm9NiJFJQ # NetworkChuck + - type: group + widgets: + - type: reddit + subreddit: devops + show-thumbnails: true + - type: reddit + subreddit: python + show-thumbnails: true + - type: reddit + subreddit: unixporn + show-thumbnails: true + #### Mainstream/Reviewers + - type: videos + channels: + - UCBJycsmduvYEL83R_U4JriQ # MKBHD + - type: group + widgets: + - type: reddit + subreddit: technology + show-thumbnails: true + - type: reddit + subreddit: chatgpt + show-thumbnails: true + + + # - size: small + # widgets: + # - type: weather + # location: London, United Kingdom + + # - type: markets + # markets: + # - symbol: SPY + # name: S&P 500 + # - symbol: BTC-USD + # name: Bitcoin + # - symbol: NVDA + # name: NVIDIA + # - symbol: AAPL + # name: Apple + # - symbol: MSFT + # name: Microsoft + # - symbol: GOOGL + # name: Google + # - symbol: AMD + # name: AMD + # - symbol: RDDT + # name: Reddit + + - name: Entertainment + columns: + - size: full + widgets: + ### Pop/Black Culture + - type: videos + channels: + - UCnxQ8o9RpqxGF2oLHcCn9VQ # fantano + - UCgi2u-lGY-2i2ubLsUr6FbQ # FD Signifier + - UCQ86N3Ulc7yBuY4TZSWjaxA # [Deleted] + - type: group + widgets: + - type: reddit + subreddit: rapbattles + show-thumbnails: true + - type: reddit + subreddit: kingpush + show-thumbnails: true + - type: reddit + subreddit: kendricklamar + show-thumbnails: true + #### Comedy + - type: videos + channels: + - UCLuYADJ6hESLHX87JnsGbjA # Josh Joshnson + - type: group + widgets: + - type: reddit + subreddit: blackpeopletwitter + + + + # - size: small + # widgets: + # - type: weather + # location: London, United Kingdom + + # - type: markets + # markets: + # - symbol: SPY + # name: S&P 500 + # - symbol: BTC-USD + # name: Bitcoin + # - symbol: NVDA + # name: NVIDIA + # - symbol: AAPL + # name: Apple + # - symbol: MSFT + # name: Microsoft + # - symbol: GOOGL + # name: Google + # - symbol: AMD + # name: AMD + # - symbol: RDDT + # name: Reddit + + - name: The World + columns: + - size: small + widgets: + - type: calendar + + - size: full + widgets: + # #### Local/US + # - type: videos + # channels: + # - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling + # - UCv6J_jJa8GJqFwQNgNrMuww # ServeTheHome + # - UCOk-gHyjcWZNj3Br4oxwh0A # Techno Tim + - type: group + widgets: + - type: reddit + subreddit: news + show-thumbnails: true + - type: reddit + subreddit: politics + show-thumbnails: true + #### GeoPolitics + - type: videos + channels: + - UCsy9I56PY3IngCf_VGjunMQ # Zeihan + - type: group + widgets: + - type: reddit + subreddit: geopolitics + show-thumbnails: true + - type: reddit + subreddit: worldnews + show-thumbnails: true + + + + # - size: small + # widgets: + # - type: weather + # location: London, United Kingdom + + # - type: markets + # markets: + # - symbol: SPY + # name: S&P 500 + # - symbol: BTC-USD + # name: Bitcoin + # - symbol: NVDA + # name: NVIDIA + # - symbol: AAPL + # name: Apple + # - symbol: MSFT + # name: Microsoft + # - symbol: GOOGL + # name: Google + # - symbol: AMD + # name: AMD + # - symbol: RDDT + # name: Reddit + + + + + + + # - name: Self-Hosted + # columns: + # - size: small + # widgets: + # - type: calendar + + # - type: rss + # limit: 10 + # collapse-after: 3 + # cache: 3h + # feeds: + # - url: https://ciechanow.ski/atom.xml + # - url: https://www.joshwcomeau.com/rss.xml + # title: Josh Comeau + # - url: https://samwho.dev/rss.xml + # - url: https://awesomekling.github.io/feed.xml + # - url: https://ishadeed.com/feed.xml + # title: Ahmad Shadeed + + # - type: twitch-channels + # channels: + # - theprimeagen + # - cohhcarnage + # - christitustech + # - blurbs + # - asmongold + # - jembawls + + # - size: full + # widgets: + # - type: hacker-news + + # - type: videos + # channels: + # - UCR-DXc1voovS8nhAvccRZhg # Jeff Geerling + # - UCv6J_jJa8GJqFwQNgNrMuww # ServeTheHome + # - UCOk-gHyjcWZNj3Br4oxwh0A # Techno Tim + + # - type: reddit + # subreddit: selfhosted + + # - size: small + # widgets: + # - type: weather + # location: London, United Kingdom + + # - type: markets + # markets: + # - symbol: SPY + # name: S&P 500 + # - symbol: BTC-USD + # name: Bitcoin + # - symbol: NVDA + # name: NVIDIA + # - symbol: AAPL + # name: Apple + # - symbol: MSFT + # name: Microsoft + # - symbol: GOOGL + # name: Google + # - symbol: AMD + # name: AMD + # - symbol: RDDT + # name: Reddit diff --git a/hastebin/docker-compose.yml b/hastebin/docker-compose.yml new file mode 100644 index 0000000..a74d475 --- /dev/null +++ b/hastebin/docker-compose.yml @@ -0,0 +1,15 @@ +services: + hastebin: + image: rlister/hastebin + environment: + STORAGE_TYPE: redis + STORAGE_HOST: hastebinredis + ports: + - "1006:7777" + hastebinredis: + image: redis + volumes: + - redis_data:/data + +volumes: + redis_data: diff --git a/hoarder/docker-compose.yml b/hoarder/docker-compose.yml index b1bb3ef..582374f 100644 --- a/hoarder/docker-compose.yml +++ b/hoarder/docker-compose.yml @@ -6,7 +6,7 @@ services: volumes: - hoarder_data:/data ports: - - 3000:1003 + - 1003:3000 env_file: - .env environment: diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index e5454e6..47cdf1c 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -8,10 +8,12 @@ services: - "8080:8080" - "8443:8443" volumes: - - nextcloud_aio_mastercontainer:/mnt/docker-aio-config + - aio_mastercontainer:/mnt/docker-aio-config - /var/run/docker.sock:/var/run/docker.sock:ro stdin_open: true tty: true volumes: - nextcloud_aio_mastercontainer: + aio_mastercontainer: + + diff --git a/olivetin/config.yml b/olivetin/config.yaml similarity index 100% rename from olivetin/config.yml rename to olivetin/config.yaml diff --git a/olivetin/docker-compose.yml b/olivetin/docker-compose.yml new file mode 100644 index 0000000..8d87f70 --- /dev/null +++ b/olivetin/docker-compose.yml @@ -0,0 +1,9 @@ +services: + olivetin: + container_name: olivetin + image: jamesread/olivetin + volumes: + - ./:/config # replace host path or volume as needed + ports: + - "1004:1337" + restart: unless-stopped \ No newline at end of file