I don't know anymore

2024-06-05 16:59:33 -04:00 · 2024-06-05 16:59:33 -04:00 · 8bfc014907
commit 8bfc014907
parent fb07bb4688
22 changed files with 2777 additions and 15 deletions
--- a/arr/extensions/freshrss-comicsinfeed
+++ b/arr/extensions/freshrss-comicsinfeed
@ -1 +0,0 @@
-Subproject commit bc4648940633919d5a8b7d6713a074d2a197b0a3
--- a/botc/.gitignore
+++ b/botc/.gitignore
@ -1 +1,2 @@
 backup/*
+wordpress/*
--- a/botc/docker-compose.yml
+++ b/botc/docker-compose.yml
@ -21,12 +21,12 @@ services:
      WORDPRESS_DB_USER: wordpress
      WORDPRESS_DB_PASSWORD: ${DBPASS}
      WORDPRESS_DB_NAME: clocktower
-      VIRTUAL_HOST: "botc.${DOMAIN}, *.phillybotc.com, phillybotc.com"
-      LETSENCRYPT_HOST: "botc.${DOMAIN}, *.phillybotc.com, phillybotc.com"
+      VIRTUAL_HOST: "www.phillybotc.com, phillybotc.com"
+      LETSENCRYPT_HOST: "phillybotc.com, www.phillybotc.com"
      LETSENCRYPT_EMAIL: ${EMAIL}
-      LETSENCRYPT_TEST: true
+      # LETSENCRYPT_TEST: true
    volumes:
-      - wordpress:/var/www/html
+      - ./wordpress:/var/www/html
      - ./backup:/var/www/html/wp-content/updraft
 volumes:
  wordpress:
--- a/games/.env.example
+++ b/games/.env.example
@ -0,0 +1,10 @@
+DOMAIN=example.com
+UID=1000
+GID=1000
+TZ=Etc/UTC
+CONFIG_LOCATION=./config
+DATA_LOCATION=./data
+EMAIL=example@mail.com
+DBUSER=example
+DBPASS=password
+RAWG_API_KEY=
--- a/games/.gitignore
+++ b/games/.gitignore
@ -0,0 +1 @@
+data/*
--- a/games/docker-compose.yml
+++ b/games/docker-compose.yml
@ -0,0 +1,40 @@
+services:
+  gamevault-backend:
+    image: phalcode/gamevault-backend:latest
+    restart: unless-stopped
+    environment:
+      - PUID=${UID}
+      - PGID=${GID}
+      - DB_HOST=games-db-1
+      - DB_USERNAME=${DBUSER}
+      - DB_PASSWORD=${DBPASS}
+      - VIRTUAL_HOST=gamevault.${DOMAIN}
+      - LETSENCRYPT_HOST=gamevault.${DOMAIN}
+      - LETSENCRYPT_EMAIL=${EMAIL}
+      # Uncomment and insert your RAWG API Key here if you have one (http://rawg.io/login?forward=developer)
+      - RAWG_API_KEY=${RAWG_API_KEY}
+    volumes:
+      # Mount the folder where your games are
+      - ${DATA_LOCATION}:/files
+      # Mount the folder where GameVault should store its images
+      - ${DATA_LOCATION}/images:/images
+    expose:
+      - "8080"
+    ports:
+      - 8080:8080
+  db:
+    image: postgres:16
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: ${DBUSER}
+      POSTGRES_PASSWORD: ${DBPASS}
+      POSTGRES_DB: gamevault
+    volumes:
+      # Mount the folder where your PostgreSQL database files should land
+      - db:/var/lib/postgresql/data
+volumes:
+  db:
+networks:
+  default:
+    name: nginx-proxy
+    external: true
--- a/nextcloud/config_bak/.htaccess
+++ b/nextcloud/config_bak/.htaccess
@ -0,0 +1,25 @@
+# Section for Apache 2.4 to 2.6
+<IfModule mod_authz_core.c>
+  Require all denied
+</IfModule>
+<IfModule mod_access_compat.c>
+  Order Allow,Deny
+  Deny from all
+  Satisfy All
+</IfModule>
+
+# Section for Apache 2.2
+<IfModule !mod_authz_core.c>
+  <IfModule !mod_access_compat.c>
+    <IfModule mod_authz_host.c>
+      Order Allow,Deny
+      Deny from all
+    </IfModule>
+    Satisfy All
+  </IfModule>
+</IfModule>
+
+# Section for Apache 2.2 to 2.6
+<IfModule mod_autoindex.c>
+  IndexIgnore *
+</IfModule>
--- a/nextcloud/config_bak/apache-pretty-urls.config.php
+++ b/nextcloud/config_bak/apache-pretty-urls.config.php
@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+  'htaccess.RewriteBase' => '/',
+);
--- a/nextcloud/config_bak/apcu.config.php
+++ b/nextcloud/config_bak/apcu.config.php
@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+  'memcache.local' => '\OC\Memcache\APCu',
+);
--- a/nextcloud/config_bak/apps.config.php
+++ b/nextcloud/config_bak/apps.config.php
@ -0,0 +1,15 @@
+<?php
+$CONFIG = array (
+  'apps_paths' => array (
+      0 => array (
+              'path'     => OC::$SERVERROOT.'/apps',
+              'url'      => '/apps',
+              'writable' => false,
+      ),
+      1 => array (
+              'path'     => OC::$SERVERROOT.'/custom_apps',
+              'url'      => '/custom_apps',
+              'writable' => true,
+      ),
+  ),
+);
--- a/nextcloud/config_bak/config.php
+++ b/nextcloud/config_bak/config.php
@ -0,0 +1,69 @@
+<?php
+$CONFIG = array (
+  'htaccess.RewriteBase' => '/',
+  'memcache.local' => '\\OC\\Memcache\\Redis',
+  'redis' => 
+  array (
+    'host' => '/run/redis/redis-server.sock',
+    'port' => 0,
+    'dbindex' => 0,
+  ),
+  'apps_paths' => 
+  array (
+    0 => 
+    array (
+      'path' => '/var/www/html/apps',
+      'url' => '/apps',
+      'writable' => false,
+    ),
+    1 => 
+    array (
+      'path' => '/var/www/html/custom_apps',
+      'url' => '/custom_apps',
+      'writable' => true,
+    ),
+  ),
+  'upgrade.disable-web' => true,
+  'instanceid' => 'occ4ad33l771',
+  'passwordsalt' => 'kI051jlRvY6dJ04p/FyraeWb0J/ZLk',
+  'secret' => 'lUz/rBnWrn3GFW35ajeLFvjL89A9Mgwg3O/DZZZdx09hN3m4',
+  'trusted_domains' => 
+  array (
+    0 => 'nextcloud.brodin.rocks',
+  ),
+  'datadirectory' => '/var/www/html/data',
+  'dbtype' => 'mysql',
+  'version' => '29.0.0.19',
+  'overwrite.cli.url' => 'https://nextcloud.brodin.rocks',
+  'overwriteprotocol' => 'https',
+  'dbname' => 'nextcloud',
+  'dbhost' => 'db',
+  'dbport' => '',
+  'dbtableprefix' => 'oc_',
+  'mysql.utf8mb4' => true,
+  'dbuser' => 'nextcloud',
+  'dbpassword' => 'whiskey-wango-woxtrot',
+  'installed' => true,
+  'memories.exiftool' => '/var/www/html/custom_apps/memories/bin-ext/exiftool-amd64-glibc',
+  'memories.vod.path' => '/var/www/html/custom_apps/memories/bin-ext/go-vod-amd64',
+  'maintenance' => false,
+  'memories.vod.ffmpeg' => '/usr/bin/ffmpeg',
+  'memories.vod.ffprobe' => '/usr/bin/ffprobe',
+  'enabledPreviewProviders' => 
+  array (
+    0 => 'OC\\Preview\\Image',
+    1 => 'OC\\Preview\\Movie',
+  ),
+  'preview_max_x' => 4096,
+  'preview_max_y' => 4096,
+  'memories.gis_type' => 1,
+  'mail_smtpmode' => 'smtp',
+  'mail_smtpauth' => 1,
+  'mail_sendmailmode' => 'smtp',
+  'mail_from_address' => 'admin',
+  'mail_domain' => 'brodin.rocks',
+  'mail_smtphost' => 'smtp.sendgrid.net',
+  'mail_smtpname' => 'apikey',
+  'mail_smtppassword' => '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',
+  'mail_smtpport' => '587',
+);
--- a/nextcloud/config_bak/config.sample.php
+++ b/nextcloud/config_bak/config.sample.php
--- a/nextcloud/config_bak/redis.config.php
+++ b/nextcloud/config_bak/redis.config.php
@ -0,0 +1,17 @@
+<?php
+if (getenv('REDIS_HOST')) {
+  $CONFIG = array(
+    'memcache.distributed' => '\OC\Memcache\Redis',
+    'memcache.locking' => '\OC\Memcache\Redis',
+    'redis' => array(
+      'host' => getenv('REDIS_HOST'),
+      'password' => (string) getenv('REDIS_HOST_PASSWORD'),
+    ),
+  );
+
+  if (getenv('REDIS_HOST_PORT') !== false) {
+    $CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
+  } elseif (getenv('REDIS_HOST')[0] != '/') {
+    $CONFIG['redis']['port'] = 6379;
+  }
+}
--- a/nextcloud/config_bak/reverse-proxy.config.php
+++ b/nextcloud/config_bak/reverse-proxy.config.php
@ -0,0 +1,30 @@
+<?php
+$overwriteHost = getenv('OVERWRITEHOST');
+if ($overwriteHost) {
+  $CONFIG['overwritehost'] = $overwriteHost;
+}
+
+$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
+if ($overwriteProtocol) {
+  $CONFIG['overwriteprotocol'] = $overwriteProtocol;
+}
+
+$overwriteCliUrl = getenv('OVERWRITECLIURL');
+if ($overwriteCliUrl) {
+  $CONFIG['overwrite.cli.url'] = $overwriteCliUrl;
+}
+
+$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
+if ($overwriteWebRoot) {
+  $CONFIG['overwritewebroot'] = $overwriteWebRoot;
+}
+
+$overwriteCondAddr = getenv('OVERWRITECONDADDR');
+if ($overwriteCondAddr) {
+  $CONFIG['overwritecondaddr'] = $overwriteCondAddr;
+}
+
+$trustedProxies = getenv('TRUSTED_PROXIES');
+if ($trustedProxies) {
+  $CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
+}
--- a/nextcloud/config_bak/s3.config.php
+++ b/nextcloud/config_bak/s3.config.php
@ -0,0 +1,48 @@
+<?php
+if (getenv('OBJECTSTORE_S3_BUCKET')) {
+  $use_ssl = getenv('OBJECTSTORE_S3_SSL');
+  $use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE');
+  $use_legacyauth = getenv('OBJECTSTORE_S3_LEGACYAUTH');
+  $autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE');
+  $CONFIG = array(
+    'objectstore' => array(
+      'class' => '\OC\Files\ObjectStore\S3',
+      'arguments' => array(
+        'bucket' => getenv('OBJECTSTORE_S3_BUCKET'),
+        'region' => getenv('OBJECTSTORE_S3_REGION') ?: '',
+        'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '',
+        'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
+        'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
+        'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
+        'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
+        'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
+        // required for some non Amazon S3 implementations
+        'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
+        // required for older protocol versions
+        'legacy_auth' => $use_legacyauth == true && strtolower($use_legacyauth) !== 'false'
+      )
+    )
+  );
+
+  if (getenv('OBJECTSTORE_S3_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_KEY')) {
+    $CONFIG['objectstore']['arguments']['key'] = getenv('OBJECTSTORE_S3_KEY');
+  } else {
+    $CONFIG['objectstore']['arguments']['key'] = '';
+  }
+
+  if (getenv('OBJECTSTORE_S3_SECRET_FILE') && file_exists(getenv('OBJECTSTORE_S3_SECRET_FILE'))) {
+    $CONFIG['objectstore']['arguments']['secret'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SECRET_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SECRET')) {
+    $CONFIG['objectstore']['arguments']['secret'] = getenv('OBJECTSTORE_S3_SECRET');
+  } else {
+    $CONFIG['objectstore']['arguments']['secret'] = '';
+  }
+
+  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE') && file_exists(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE'))) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
+    $CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
+  }
+}
--- a/nextcloud/config_bak/smtp.config.php
+++ b/nextcloud/config_bak/smtp.config.php
@ -0,0 +1,22 @@
+<?php
+if (getenv('SMTP_HOST') && getenv('MAIL_FROM_ADDRESS') && getenv('MAIL_DOMAIN')) {
+  $CONFIG = array (
+    'mail_smtpmode' => 'smtp',
+    'mail_smtphost' => getenv('SMTP_HOST'),
+    'mail_smtpport' => getenv('SMTP_PORT') ?: (getenv('SMTP_SECURE') ? 465 : 25),
+    'mail_smtpsecure' => getenv('SMTP_SECURE') ?: '',
+    'mail_smtpauth' => getenv('SMTP_NAME') && (getenv('SMTP_PASSWORD') || (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE')))),
+    'mail_smtpauthtype' => getenv('SMTP_AUTHTYPE') ?: 'LOGIN',
+    'mail_smtpname' => getenv('SMTP_NAME') ?: '',
+    'mail_from_address' => getenv('MAIL_FROM_ADDRESS'),
+    'mail_domain' => getenv('MAIL_DOMAIN'),
+  );
+
+  if (getenv('SMTP_PASSWORD_FILE') && file_exists(getenv('SMTP_PASSWORD_FILE'))) {
+      $CONFIG['mail_smtppassword'] = trim(file_get_contents(getenv('SMTP_PASSWORD_FILE')));
+  } elseif (getenv('SMTP_PASSWORD')) {
+      $CONFIG['mail_smtppassword'] = getenv('SMTP_PASSWORD');
+  } else {
+      $CONFIG['mail_smtppassword'] = '';
+  }
+}
--- a/nextcloud/config_bak/swift.config.php
+++ b/nextcloud/config_bak/swift.config.php
@ -0,0 +1,31 @@
+<?php
+if (getenv('OBJECTSTORE_SWIFT_URL')) {
+    $autocreate = getenv('OBJECTSTORE_SWIFT_AUTOCREATE');
+  $CONFIG = array(
+    'objectstore' => [
+      'class' => 'OC\\Files\\ObjectStore\\Swift',
+      'arguments' => [
+        'autocreate' => $autocreate == true && strtolower($autocreate) !== 'false',
+        'user' => [
+          'name' => getenv('OBJECTSTORE_SWIFT_USER_NAME'),
+          'password' => getenv('OBJECTSTORE_SWIFT_USER_PASSWORD'),
+          'domain' => [
+            'name' => (getenv('OBJECTSTORE_SWIFT_USER_DOMAIN')) ?: 'Default',
+          ],
+        ],
+        'scope' => [
+          'project' => [
+            'name' => getenv('OBJECTSTORE_SWIFT_PROJECT_NAME'),
+            'domain' => [
+              'name' => (getenv('OBJECTSTORE_SWIFT_PROJECT_DOMAIN')) ?: 'Default',
+            ],
+          ],
+        ],
+        'serviceName' => (getenv('OBJECTSTORE_SWIFT_SERVICE_NAME')) ?: 'swift',
+        'region' => getenv('OBJECTSTORE_SWIFT_REGION'),
+        'url' => getenv('OBJECTSTORE_SWIFT_URL'),
+        'bucket' => getenv('OBJECTSTORE_SWIFT_CONTAINER_NAME'),
+      ]
+    ]
+  );
+}
--- a/nextcloud/config_bak/upgrade-disable-web.config.php
+++ b/nextcloud/config_bak/upgrade-disable-web.config.php
@ -0,0 +1,4 @@
+<?php
+$CONFIG = array (
+  'upgrade.disable-web' => true,
+);
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@ -1,38 +1,43 @@
 services:
  redis:
+    # user: "${UID}:${GID}"
    image: redis:alpine
    container_name: redis-dbcache
    restart: unless-stopped
  db:
    image: mysql:latest
    restart: always
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --log_bin_trust_function_creators=true
+    # user: ${UID}:${GID}
    volumes:
      - db:/var/lib/mysql
    environment:
-      - MYSQL_ROOT_PASSWORD=${DBPASS}
+      - MYSQL_ROOT_PASSWORD=ROOT_ACCESS_PASSWORD
      - MYSQL_PASSWORD=${DBPASS}
      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=root
+      - MYSQL_USER=nextcloud
  nextcloud:
-    image: lscr.io/linuxserver/nextcloud:latest
+    image: nextcloud:29.0.0
    container_name: nextcloud
+    # user: "${UID}:${GID}"
+    depends_on:
+      - db
+    links:
+      - db
    environment:
-      PUID: "1000"
-      PGID: "1000"
      TZ: "${TZ}"
      VIRTUAL_HOST: "nextcloud.${DOMAIN}"
      MYSQL_HOST: db
      MYSQL_DATABASE: nextcloud
-      MYSQL_USER: root
+      MYSQL_USER: nextcloud
      MYSQL_PASSWORD: ${DBPASS}
      REDIS_HOST: redis
      LETSENCRYPT_HOST: nextcloud.${DOMAIN}
      LETSENCRYPT_EMAIL: ${EMAIL}
-      #LETSENCRYPT_TEST: true
+      # LETSENCRYPT_TEST: true
    volumes:
-      - ${CONFIG_LOCATION}/nextcloud:/config
-      - ${DATA_LOCATION}/Cloud/Nextcloud:/data
+      - ${CONFIG_LOCATION}:/var/www/html/config:rw
+      - ${DATA_LOCATION}/Cloud/Nextcloud:/var/www/html/data:rw
    restart: unless-stopped
 volumes:
  db:
--- a/nginx-proxy/.env.example
+++ b/nginx-proxy/.env.example
@ -1 +1,2 @@
 EMAIL=example@mail.com
+TZ=America/New_York
--- a/nginx-proxy/docker-compose.yml
+++ b/nginx-proxy/docker-compose.yml
@ -20,6 +20,7 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock:ro
    environment:
      - DEFAULT_EMAIL=${EMAIL}
+      - TZ=${TZ}
 networks:
  default:
    name: nginx-proxy
--- a/nginx-proxy/nginx/html/.well-known/acme-challenge/0nvqKzz1EohOVB6bht1uUCmvcSSi7dBiG8jmzVdNjy4
+++ b/nginx-proxy/nginx/html/.well-known/acme-challenge/0nvqKzz1EohOVB6bht1uUCmvcSSi7dBiG8jmzVdNjy4
@ -0,0 +1 @@
+0nvqKzz1EohOVB6bht1uUCmvcSSi7dBiG8jmzVdNjy4.-pySGwa5vVkj_cOXnCDnd-dGPAV2kVXglGIYiUrWeT8
				`@ -1 +0,0 @@`
				`Subproject commit bc4648940633919d5a8b7d6713a074d2a197b0a3`
				`@ -0,0 +1 @@`
				`0nvqKzz1EohOVB6bht1uUCmvcSSi7dBiG8jmzVdNjy4.-pySGwa5vVkj_cOXnCDnd-dGPAV2kVXglGIYiUrWeT8`