diff --git a/.env.production.migration b/.env.production.migration new file mode 100644 index 0000000000..d3f69eb956 --- /dev/null +++ b/.env.production.migration @@ -0,0 +1,47 @@ +# Generated with mastodon:setup on 2022-11-15 15:48:19 UTC + +LOCAL_DOMAIN=wobbl.xyz +SECRET_KEY_BASE=c83da357f00bdffa6701aa01e6c9bc116c6ef9279df7dcf1d8c38d23c819ac9de81302113b1e2c10ecdb927b15f06001cb75a90c8cfe7b9b98be95b1dd5188ba +OTP_SECRET=792df590b3e0796e6ba6703e516efe83c839d5d4be3769bfa043b0e91d155ffb74f0e2d536db5c92142aaccddbf66b1c26c34d77be418a015e3f2463a6e22320 +VAPID_PRIVATE_KEY=WY5iQamqojTy6wbgrafpzqc8I98TLA-ICd3jJlPqmVg= +VAPID_PUBLIC_KEY=BH4EG4Ptt-__2lG7J8r7E10KDREzkSQWlqWjk12ZypX7_-z4STFDKqhLEnW_k73tSZY9DIBpePgD2oE6WfV52tU= +DB_HOST=wobbl-db-do-user-12896033-0.b.db.ondigitalocean.com +DB_PORT=25061 +DB_NAME=mastodon_production +DB_USER=doadmin +DB_PASS=AVNS_PRyTPQxHtb2b0hVU6k9 +PREPARED_STATEMENTS=false +REDIS_HOST=localhost +REDIS_PORT=6379 +SMTP_SERVER=smtppro.zoho.com +SMTP_PORT=465 +SMTP_LOGIN=drew@gyro-tech.net +SMTP_PASSWORD=xBb11buC51Uw +SMTP_AUTH_METHOD=plain +SMTP_OPENSSL_VERIFY_MODE=none +SMTP_FROM_ADDRESS=Mastodon +SMTP_SSL=true +S3_ALIAS_HOST=media.wobbl.xyz +S3_ENABLED=true +S3_BUCKET=wobblstore +AWS_ACCESS_KEY_ID=DO00CAHETF4R6VJUL2CY +AWS_SECRET_ACCESS_KEY=2TdKYVE2Q7tl4gl5kNHAN9hedJ/4IOWSTciIKshviR0 +S3_PROTOCOL=https +S3_REGION=us-east-1 +S3_HOSTNAME=wobblstore.nyc3.digitaloceanspaces.com +S3_ENDPOINT=https://nyc3.digitaloceanspaces.com +ES_ENABLED=true +ES_HOST=localhost +ES_PORT=9200 +DEEPL_API_KEY="eb039661-3635-bf38-6d92-19a2a15c0795:fx" +DEEPL_PLAN=free +STATSD_ADDR=localhost:9125 +MAX_TOOT_CHARS=1500 + + +# Scaling work +WEB_CONCURRENCY=5 +MAX_THREADS=5 +DB_POOL=18 + +MAX_IMAGE_SIZE=16777216 diff --git a/.env.production.old b/.env.production.old new file mode 100644 index 0000000000..5467cc654b --- /dev/null +++ b/.env.production.old @@ -0,0 +1,48 @@ +# Generated with mastodon:setup on 2022-11-15 15:48:19 UTC + +LOCAL_DOMAIN=wobbl.xyz +SECRET_KEY_BASE=c83da357f00bdffa6701aa01e6c9bc116c6ef9279df7dcf1d8c38d23c819ac9de81302113b1e2c10ecdb927b15f06001cb75a90c8cfe7b9b98be95b1dd5188ba +OTP_SECRET=792df590b3e0796e6ba6703e516efe83c839d5d4be3769bfa043b0e91d155ffb74f0e2d536db5c92142aaccddbf66b1c26c34d77be418a015e3f2463a6e22320 +VAPID_PRIVATE_KEY=WY5iQamqojTy6wbgrafpzqc8I98TLA-ICd3jJlPqmVg= +VAPID_PUBLIC_KEY=BH4EG4Ptt-__2lG7J8r7E10KDREzkSQWlqWjk12ZypX7_-z4STFDKqhLEnW_k73tSZY9DIBpePgD2oE6WfV52tU= +DB_HOST=/var/run/postgresql +DB_PORT=5432 +DB_NAME=mastodon_production +DB_USER=mastodon +DB_PASS=bDyxK8nLdCgm +#PREPARED_STATEMENTS=false +REDIS_HOST=localhost +REDIS_PORT=6379 +SMTP_SERVER=smtppro.zoho.com +SMTP_PORT=465 +SMTP_LOGIN=drew@gyro-tech.net +SMTP_PASSWORD=xBb11buC51Uw +SMTP_AUTH_METHOD=plain +SMTP_OPENSSL_VERIFY_MODE=none +SMTP_FROM_ADDRESS=Mastodon +SMTP_SSL=true +S3_ALIAS_HOST=media.wobbl.xyz +S3_ENABLED=true +S3_BUCKET=wobblstore +AWS_ACCESS_KEY_ID=DO00CAHETF4R6VJUL2CY +AWS_SECRET_ACCESS_KEY=2TdKYVE2Q7tl4gl5kNHAN9hedJ/4IOWSTciIKshviR0 +S3_PROTOCOL=https +S3_REGION=us-east-1 +S3_HOSTNAME=wobblstore.nyc3.digitaloceanspaces.com +S3_ENDPOINT=https://nyc3.digitaloceanspaces.com +ES_ENABLED=true +ES_HOST=localhost +ES_PORT=9200 +DEEPL_API_KEY="eb039661-3635-bf38-6d92-19a2a15c0795:fx" +DEEPL_PLAN=free +STATSD_ADDR=localhost:9125 +MAX_TOOT_CHARS=1500 + + +# Scaling work +WEB_CoNCURRENCY=5 +MAX_THREADS=5 +DB_POOL=25 + +# Image Size +MAX_IMAGE_SIZE=16777216 diff --git a/app/javascript/flavours/glitch/utils/resize_image.js b/app/javascript/flavours/glitch/utils/resize_image.js index e3d4e6a354..22058738d5 100644 --- a/app/javascript/flavours/glitch/utils/resize_image.js +++ b/app/javascript/flavours/glitch/utils/resize_image.js @@ -1,6 +1,6 @@ import EXIF from 'exif-js'; -const MAX_IMAGE_PIXELS = 2073600; // 1920x1080px +const MAX_IMAGE_PIXELS = 8294400; // 3840x2160px const _browser_quirks = {}; diff --git a/ca-certificate.crt b/ca-certificate.crt new file mode 100644 index 0000000000..8db27498bd --- /dev/null +++ b/ca-certificate.crt @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + +GYRO-NAS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + diff --git a/config/locales/en.yml b/config/locales/en.yml index dbab4b620d..bc9b8fcc7e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1216,9 +1216,9 @@ en: title: Security verification failed '429': Too many requests '500': - content: We're sorry, but something went wrong on our end. You can check the status of Wobbl and its companion systems at our status page - https://status.tarrien.net/status/wobbl . + content: We're sorry, but something went wrong on our end. You can check the status of Wobbl and its companion systems at our status page - https://status.wobbl.xyz. title: This page is not correct - '503': The page could not be served due to a temporary server failure. You can check the status of Wobbl and its companion systems at our status page - https://status.tarrien.net/status/wobbl. + '503': The page could not be served due to a temporary server failure. You can check the status of Wobbl and its companion systems at our status page - https://status.wobbl.xyz. noscript_html: To use the Mastodon web application, please enable JavaScript. Alternatively, try one of the native apps for Mastodon for your platform. existing_username_validator: not_found: could not find a local user with that username diff --git a/db/migrate/20181116173541_copy_account_stats.rb b/db/migrate/20181116173541_copy_account_stats.rb index e5faee0cb5..24b0ad6376 100644 --- a/db/migrate/20181116173541_copy_account_stats.rb +++ b/db/migrate/20181116173541_copy_account_stats.rb @@ -3,10 +3,6 @@ class CopyAccountStats < ActiveRecord::Migration[5.2] disable_ddl_transaction! - class MigrationAccount < ApplicationRecord - self.table_name = :accounts - end - def up safety_assured do if supports_upsert? @@ -30,7 +26,7 @@ class CopyAccountStats < ActiveRecord::Migration[5.2] def up_fast say 'Upsert is available, importing counters using the fast method' - MigrationAccount.unscoped.select('id').find_in_batches(batch_size: 5_000) do |accounts| + Account.unscoped.select('id').find_in_batches(batch_size: 5_000) do |accounts| execute <<-SQL.squish INSERT INTO account_stats (account_id, statuses_count, following_count, followers_count, created_at, updated_at) SELECT id, statuses_count, following_count, followers_count, created_at, updated_at @@ -47,7 +43,7 @@ class CopyAccountStats < ActiveRecord::Migration[5.2] # We cannot use bulk INSERT or overarching transactions here because of possible # uniqueness violations that we need to skip over - MigrationAccount.unscoped.select('id, statuses_count, following_count, followers_count, created_at, updated_at').find_each do |account| + Account.unscoped.select('id, statuses_count, following_count, followers_count, created_at, updated_at').find_each do |account| params = [account.id, account[:statuses_count], account[:following_count], account[:followers_count], account.created_at, account.updated_at] exec_insert('INSERT INTO account_stats (account_id, statuses_count, following_count, followers_count, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)', nil, params) rescue ActiveRecord::RecordNotUnique