Browse Source

Various updates for Nanobox deploys (#11988)

master
Dan Hunsaker 2 months ago
parent
commit
110bcf1c8d
2 changed files with 44 additions and 15 deletions
  1. 41
    15
      .env.nanobox
  2. 3
    0
      boxfile.yml

+ 41
- 15
.env.nanobox View File

@@ -11,24 +11,14 @@ DB_NAME=gonano
11 11
 DB_PASS=$DATA_DB_PASS
12 12
 DB_PORT=5432
13 13
 
14
-DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano
14
+# DATABASE_URL=postgresql://$DATA_DB_USER:$DATA_DB_PASS@$DATA_DB_HOST/gonano
15 15
 
16 16
 # Optional ElasticSearch configuration
17 17
 ES_ENABLED=true
18 18
 ES_HOST=$DATA_ELASTIC_HOST
19 19
 ES_PORT=9200
20 20
 
21
-# Optimizations
22
-LD_PRELOAD=/data/lib/libjemalloc.so
23
-
24
-# ImageMagick optimizations
25
-MAGICK_TEMPORARY_PATH=/app/tmp
26
-MAGICK_MEMORY_LIMIT=128MiB
27
-MAGICK_MAP_LIMIT=64MiB
28
-MAGICK_TIME_LIMIT=15
29
-MAGICK_AREA_LIMIT=16MP
30
-MAGICK_WIDTH_LIMIT=8KP
31
-MAGICK_HEIGHT_LIMIT=8KP
21
+BIND=0.0.0.0
32 22
 
33 23
 # Federation
34 24
 # Note: Changing LOCAL_DOMAIN at a later time will cause unwanted side effects, including breaking all existing federation.
@@ -84,6 +74,7 @@ SMTP_PORT=587
84 74
 SMTP_LOGIN=$SMTP_LOGIN
85 75
 SMTP_PASSWORD=$SMTP_PASSWORD
86 76
 SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
77
+#SMTP_REPLY_TO=
87 78
 #SMTP_DOMAIN= # defaults to LOCAL_DOMAIN
88 79
 #SMTP_DELIVERY_METHOD=smtp # delivery method can also be sendmail
89 80
 #SMTP_AUTH_METHOD=plain
@@ -97,9 +88,17 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
97 88
 # PAPERCLIP_ROOT_URL=/system
98 89
 
99 90
 # Optional asset host for multi-server setups
91
+# The asset host must allow cross origin request from WEB_DOMAIN or LOCAL_DOMAIN
92
+# if WEB_DOMAIN is not set. For example, the server may have the
93
+# following header field:
94
+# Access-Control-Allow-Origin: https://example.com/
100 95
 # CDN_HOST=https://assets.example.com
101 96
 
102 97
 # S3 (optional)
98
+# The attachment host must allow cross origin request from WEB_DOMAIN or
99
+# LOCAL_DOMAIN if WEB_DOMAIN is not set. For example, the server may have the
100
+# following header field:
101
+# Access-Control-Allow-Origin: https://192.168.1.123:9000/
103 102
 # S3_ENABLED=true
104 103
 # S3_BUCKET=
105 104
 # AWS_ACCESS_KEY_ID=
@@ -109,6 +108,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
109 108
 # S3_HOSTNAME=192.168.1.123:9000
110 109
 
111 110
 # S3 (Minio Config (optional) Please check Minio instance for details)
111
+# The attachment host must allow cross origin request - see the description
112
+# above.
112 113
 # S3_ENABLED=true
113 114
 # S3_BUCKET=
114 115
 # AWS_ACCESS_KEY_ID=
@@ -119,12 +120,30 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
119 120
 # S3_ENDPOINT=
120 121
 # S3_SIGNATURE_VERSION=
121 122
 
123
+# Google Cloud Storage (optional)
124
+# Use S3 compatible API. Since GCS does not support Multipart Upload,
125
+# increase the value of S3_MULTIPART_THRESHOLD to disable Multipart Upload.
126
+# The attachment host must allow cross origin request - see the description
127
+# above.
128
+# S3_ENABLED=true
129
+# AWS_ACCESS_KEY_ID=
130
+# AWS_SECRET_ACCESS_KEY=
131
+# S3_REGION=
132
+# S3_PROTOCOL=https
133
+# S3_HOSTNAME=storage.googleapis.com
134
+# S3_ENDPOINT=https://storage.googleapis.com
135
+# S3_MULTIPART_THRESHOLD=52428801 # 50.megabytes
136
+
122 137
 # Swift (optional)
138
+# The attachment host must allow cross origin request - see the description
139
+# above.
123 140
 # SWIFT_ENABLED=true
124 141
 # SWIFT_USERNAME=
125 142
 # For Keystone V3, the value for SWIFT_TENANT should be the project name
126 143
 # SWIFT_TENANT=
127 144
 # SWIFT_PASSWORD=
145
+# Some OpenStack V3 providers require PROJECT_ID (optional)
146
+# SWIFT_PROJECT_ID=
128 147
 # Keystone V2 and V3 URLs are supported. Use a V3 URL if possible to avoid
129 148
 # issues with token rate-limiting during high load.
130 149
 # SWIFT_AUTH_URL=
@@ -171,8 +190,8 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
171 190
 # The pam environment variable "email" is provided by:
172 191
 # https://github.com/devkral/pam_email_extractor
173 192
 # PAM_ENABLED=true
174
-# Fallback Suffix for email address generation (nil by default)
175
-# PAM_DEFAULT_SUFFIX=pam
193
+# Fallback email domain for email address generation (LOCAL_DOMAIN by default)
194
+# PAM_EMAIL_DOMAIN=example.com
176 195
 # Name of the pam service (pam "auth" section is evaluated)
177 196
 # PAM_DEFAULT_SERVICE=rpam
178 197
 # Name of the pam service used for checking if an user can register (pam "account" section is evaluated) (nil (disabled) by default)
@@ -220,7 +239,14 @@ SMTP_FROM_ADDRESS=notifications@${APP_NAME}.nanoapp.io
220 239
 # SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED=true
221 240
 # SAML_ATTRIBUTES_STATEMENTS_UID="urn:oid:0.9.2342.19200300.100.1.1"
222 241
 # SAML_ATTRIBUTES_STATEMENTS_EMAIL="urn:oid:1.3.6.1.4.1.5923.1.1.1.6"
223
-# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.5.4.42"
242
+# SAML_ATTRIBUTES_STATEMENTS_FULL_NAME="urn:oid:2.16.840.1.113730.3.1.241"
243
+# SAML_ATTRIBUTES_STATEMENTS_FIRST_NAME="urn:oid:2.5.4.42"
244
+# SAML_ATTRIBUTES_STATEMENTS_LAST_NAME="urn:oid:2.5.4.4"
224 245
 # SAML_UID_ATTRIBUTE="urn:oid:0.9.2342.19200300.100.1.1"
225 246
 # SAML_ATTRIBUTES_STATEMENTS_VERIFIED=
226 247
 # SAML_ATTRIBUTES_STATEMENTS_VERIFIED_EMAIL=
248
+
249
+# Use HTTP proxy for outgoing request (optional)
250
+# http_proxy=http://gateway.local:8118
251
+# Access control for hidden service.
252
+# ALLOW_ACCESS_TO_HIDDEN_SERVICE=true

+ 3
- 0
boxfile.yml View File

@@ -67,6 +67,9 @@ deploy.config:
67 67
             bin/tootctl search deploy
68 68
           fi
69 69
       - bin/tootctl cache clear
70
+  after_live:
71
+    worker.sidekiq:
72
+      - bin/tootctl search deploy
70 73
 
71 74
 
72 75
 web.web:

Loading…
Cancel
Save