diff --git a/docker-compose.yml b/docker-compose.yml index 0a6aab770..dc261b01c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,9 @@ services: build: context: . volumes: - - "./:/opt/Drama/service" + - "./:/drama/service" environment: - - PYTHONPATH="opt/Drama/service" + - PYTHONPATH="drama/service" - REDIS_URL=redis://redis - DATABASE_URL=postgresql://postgres@postgres:5432/postgres - DATABASE_CONNECTION_POOL_URL=postgresql://postgres@postgres:5432/postgres @@ -43,7 +43,7 @@ services: redis: image: redis volumes: - - ./redis.conf:/opt/Drama/redis.conf + - ./redis.conf:/drama/redis.conf ports: - "6379:6379" diff --git a/drama/templates/2fa_modal.html b/drama/templates/2fa_modal.html index 135d8f287..dd6a99a62 100644 --- a/drama/templates/2fa_modal.html +++ b/drama/templates/2fa_modal.html @@ -24,7 +24,7 @@
Or enter this code: {{mfa_secret}}

- Step 2: Enter the six-digit code generated in the authenticator app and your Drama account password. + Step 2: Enter the six-digit code generated in the authenticator app and your {{"SITE_NAME" | app_config}} account password.

@@ -47,7 +47,7 @@ diff --git a/drama/templates/admin/admin_home.html b/drama/templates/admin/admin_home.html index 72ac852ac..09358d5c8 100644 --- a/drama/templates/admin/admin_home.html +++ b/drama/templates/admin/admin_home.html @@ -1,8 +1,8 @@ {% extends "default.html" %} {% block title %} -Drama - +{{"SITE_NAME" | app_config}} + {% endblock %} {% block content %} diff --git a/drama/templates/admin/alt_votes.html b/drama/templates/admin/alt_votes.html index bcbae9b4d..f3fac13dd 100644 --- a/drama/templates/admin/alt_votes.html +++ b/drama/templates/admin/alt_votes.html @@ -1,8 +1,8 @@ {% extends "default.html" %} {% block title %} -Drama - +{{"SITE_NAME" | app_config}} + {% endblock %} {% block content %} diff --git a/drama/templates/admin/app.html b/drama/templates/admin/app.html index ff521ec0c..d08b27b97 100644 --- a/drama/templates/admin/app.html +++ b/drama/templates/admin/app.html @@ -2,7 +2,7 @@ {% block title %} API App Administration - + {% endblock %} {% block content %} diff --git a/drama/templates/admin/app_data.html b/drama/templates/admin/app_data.html index 891fa917e..5ca4fba17 100644 --- a/drama/templates/admin/app_data.html +++ b/drama/templates/admin/app_data.html @@ -1,8 +1,8 @@ {% extends "default.html" %} {% block title %} -Drama - +{{"SITE_NAME" | app_config}} + {% endblock %} {% block content %} diff --git a/drama/templates/admin/apps.html b/drama/templates/admin/apps.html index 8afaac3fc..10340e793 100644 --- a/drama/templates/admin/apps.html +++ b/drama/templates/admin/apps.html @@ -2,7 +2,7 @@ {% block title %} API App Administration - + {% endblock %} {% block content %} diff --git a/drama/templates/admin/content_stats.html b/drama/templates/admin/content_stats.html index bf3104a8e..af11e57eb 100644 --- a/drama/templates/admin/content_stats.html +++ b/drama/templates/admin/content_stats.html @@ -1,8 +1,8 @@ {% extends "default.html" %} {% block title %} -Drama - +{{"SITE_NAME" | app_config}} + {% endblock %} {% block content %} diff --git a/drama/templates/admin/flagged_posts.html b/drama/templates/admin/flagged_posts.html index ecd1eb5d7..7c5040fa6 100644 --- a/drama/templates/admin/flagged_posts.html +++ b/drama/templates/admin/flagged_posts.html @@ -64,7 +64,7 @@ {% block title %} Flagged Posts - + {% endblock %} {% block content %} diff --git a/drama/templates/admin/image_posts.html b/drama/templates/admin/image_posts.html index 57a60be1f..f633ad0ab 100644 --- a/drama/templates/admin/image_posts.html +++ b/drama/templates/admin/image_posts.html @@ -36,7 +36,7 @@ {% block title %} Image feed - + {% endblock %} diff --git a/drama/templates/admin/manage_domain.html b/drama/templates/admin/manage_domain.html index 2f679f732..6b1aae07d 100644 --- a/drama/templates/admin/manage_domain.html +++ b/drama/templates/admin/manage_domain.html @@ -1,8 +1,8 @@ {% extends "default.html" %} {% block title %} -Drama - +{{"SITE_NAME" | app_config}} + {% endblock %} {% block content %} diff --git a/drama/templates/admin/removed_posts.html b/drama/templates/admin/removed_posts.html index dd550af72..62eb6b449 100644 --- a/drama/templates/admin/removed_posts.html +++ b/drama/templates/admin/removed_posts.html @@ -3,7 +3,7 @@ {% block title %} Removed Content - + {% endblock %} {% block content %} diff --git a/drama/templates/api.html b/drama/templates/api.html index f0deca5b7..ced2dff51 100644 --- a/drama/templates/api.html +++ b/drama/templates/api.html @@ -1,22 +1,23 @@ {% extends "default.html" %} {% block title %} -Drama - API - +{{"SITE_NAME" | app_config}} - API + {% endblock %} {% block content %} +{{"SITE_NAME" | app_config}}

 {% filter markdown %}
 # OAuth2
 
-The OAuth2 authorization flow is used to enable users to authorize third-party applications to access their Drama account without having to provide their login information to the application.
+The OAuth2 authorization flow is used to enable users to authorize third-party applications to access their {{"SITE_NAME" | app_config}} account without having to provide their login information to the application.
 
 This page explains how to obtain API application keys, how to prompt a user for authorization, and how to obtain and use access tokens. 
 
 ## Step 1: Create your Application
 
-In the [apps tab of Drama settings](/settings/apps), fill in and submit the form to request new API keys. You will need:
+In the [apps tab of {{"SITE_NAME" | app_config}} settings](/settings/apps), fill in and submit the form to request new API keys. You will need:
 
 * an application name
 * a Redirect URI, or a comma-separated list of redirect URIs. May not use HTTP unless using localhost (use HTTPS instead).
@@ -24,7 +25,7 @@ In the [apps tab of Drama settings](/settings/apps), fill in and submit the form
 
 Don't worry too much about accuracy; you will be able to change all of these later.
 
-Drama administrators will review and approve or deny your request for API keys. You'll know when your request has been approved when a client ID and secret appear in your application information.
+{{"SITE_NAME" | app_config}} administrators will review and approve or deny your request for API keys. You'll know when your request has been approved when a client ID and secret appear in your application information.
 
 DO NOT reveal your Client Secret. Anyone with your Client Secret will be able to pretend to be you. You are responsible for keeping your Client Secret a secret!
 
@@ -38,11 +39,11 @@ Send your user to `https://rdrama.net/oauth/authorize`, with the following URL p
 * `scope` - A comma-separated list of permission scopes that you are requesting. Valid scopes are: `identity`, `create`, `read`, `update`, `delete` and `vote`.
 * `permanent` - optional. Set to `true` if you are requesting indefinite access. Omit if not.
 
-If done correctly, the user will see that your application wants to access their Drama account, and be prompted to approve or deny the request.
+If done correctly, the user will see that your application wants to access their {{"SITE_NAME" | app_config}} account, and be prompted to approve or deny the request.
 
 ## Step 3: Catch the redirect
 
-The user clicks "Authorize". Drama will redirect the user's browser to GET the designated redirect URI. The following URL parameters will be included, which your server should process:
+The user clicks "Authorize". {{"SITE_NAME" | app_config}} will redirect the user's browser to GET the designated redirect URI. The following URL parameters will be included, which your server should process:
 
 * `code` - a **single-use** authorization code.
 * `state` - The state token from earlier.
@@ -89,11 +90,11 @@ If everything is good, we will respond with the following (example) JSON body:
 	}
 
 
-Store the access and refresh tokens. You should also store expiration timestamp and the scopes list, so that you pre-emptively avoid sending requests to Drama that won't be accepted.
+Store the access and refresh tokens. You should also store expiration timestamp and the scopes list, so that you pre-emptively avoid sending requests to {{"SITE_NAME" | app_config}} that won't be accepted.
 
 ## Step 5: Using the Access Token
 
-To use the access token, include the following header in subsequent API requests to Drama: `Authorization: Bearer access_token_goes_here`
+To use the access token, include the following header in subsequent API requests to {{"SITE_NAME" | app_config}}: `Authorization: Bearer access_token_goes_here`
 
 Python example, presuming that the application has obtained a valid `read` authorization:
 
@@ -101,7 +102,7 @@ Python example, presuming that the application has obtained a valid `read` autho
 	import requests
 
 	headers={"Authorization": "Bearer " + access_token,
-			 "User-Agent": "Drama Reader v1 by @carpathianflorist"}
+			 "User-Agent": "{{"SITE_NAME" | app_config}} Reader v1 by @carpathianflorist"}
 	url="/"
 
 	r=requests.get(url, headers=headers)
diff --git a/drama/templates/authforms.html b/drama/templates/authforms.html
index 24f87bc8b..0bc0c834c 100644
--- a/drama/templates/authforms.html
+++ b/drama/templates/authforms.html
@@ -5,10 +5,10 @@
 
 		
 		
-		
+		
 		
 
-		{% block pagetitle %}Drama - the open, free-speech social platform{% endblock %}
+		{% block pagetitle %}{{"SITE_NAME" | app_config}} - the open, free-speech social platform{% endblock %}
 
 		
 
@@ -23,7 +23,7 @@
 				integrity="sha384-L469/ELG4Bg9sDQbl0hvjMq8pOcqFgkSpwhwnslzvVVGpDjYJ6wJJyYjvG3u8XW7"
 				crossorigin="anonymous">
 
-		
+		
 		{% if v %}
 			
 			{% if v.agendaposter %}{% elif v.css %}{% endif %}
@@ -57,7 +57,7 @@
 										
- Drama + {{"SITE_NAME" | app_config}}

{% block authtitle %}{% endblock %}

diff --git a/drama/templates/badges.html b/drama/templates/badges.html index 305e0a39d..7982aa2e4 100644 --- a/drama/templates/badges.html +++ b/drama/templates/badges.html @@ -9,7 +9,7 @@
Badges are sorted into bronze, silver, gold, and diamond tiers, based on the relative difficulty of obtaining them.

Unlockable Badges

-
These badges are automatically granted through different kinds of activity on Drama.
+
These badges are automatically granted through different kinds of activity on {{"SITE_NAME" | app_config}}.
diff --git a/drama/templates/comment_failed.html b/drama/templates/comment_failed.html index f18297b07..ebeb3beb6 100644 --- a/drama/templates/comment_failed.html +++ b/drama/templates/comment_failed.html @@ -10,7 +10,7 @@

Whoops!

-

Although Drama puts your freedom of speech first, there are a few things that we don't allow here:

+

Although {{"SITE_NAME" | app_config}} puts your freedom of speech first, there are a few things that we don't allow here:

{% endif %} -

Contact Drama Admins

+

Contact {{"SITE_NAME" | app_config}} Admins

{% if v and v.is_activated and not v.is_suspended %} -

Use this form to contact Drama Admins.

+

Use this form to contact {{"SITE_NAME" | app_config}} Admins.

@@ -50,7 +50,7 @@ {% elif v and v.is_suspended %} -

Your Drama account has been suspended. You are not permitted to use this form.

+

Your {{"SITE_NAME" | app_config}} account has been suspended. You are not permitted to use this form.

{% elif v %} diff --git a/drama/templates/default.html b/drama/templates/default.html index a3f9d55c2..16d18d6e5 100644 --- a/drama/templates/default.html +++ b/drama/templates/default.html @@ -799,10 +799,10 @@ {% block title %} - Drama + {{"SITE_NAME" | app_config}} - + @@ -812,7 +812,7 @@ - + @@ -835,8 +835,8 @@ - - + + @@ -971,7 +971,7 @@ - + {% block stylesheets %} @@ -1128,7 +1128,7 @@ {% if request.path=='/' and g.system and g.timestamp>session.get('tooltip_last_dismissed',0)+60*60*24 and (not g.system.endswith('/chrome') and not g.system.endswith('/other')) and not g.system.endswith('/webview') %}
-
+
{% endif %} diff --git a/drama/templates/delete_comment_modal.html b/drama/templates/delete_comment_modal.html index 39bd8b09e..32b742166 100644 --- a/drama/templates/delete_comment_modal.html +++ b/drama/templates/delete_comment_modal.html @@ -15,7 +15,7 @@ -

Your comment will be removed everywhere on Drama. This action cannot be undone.

+

Your comment will be removed everywhere on {{"SITE_NAME" | app_config}}. This action cannot be undone.

-

Please note that Drama will never ask you for your email, password, or two-factor token via email, text, or phone.

+

Please note that {{"SITE_NAME" | app_config}} will never ask you for your email, password, or two-factor token via email, text, or phone.