From: Dessalines <dessalines@users.noreply.github.com>
Date: Mon, 2 Nov 2020 03:44:28 +0000 (-0500)
Subject: Merge pull request #1247 from knkski/iframely-url-setting
X-Git-Url: http://these/git/ui/assets/static/%7Bthis.state.url%7D?a=commitdiff_plain;h=cca0b4c0f9b038ba45df5b3f7d48ce0ab2b1eb03;p=lemmy.git

Merge pull request #1247 from knkski/iframely-url-setting

Add iframely_url setting
---

cca0b4c0f9b038ba45df5b3f7d48ce0ab2b1eb03
diff --cc config/defaults.hjson
index 59b808f8,42222550..f23b1fb1
--- a/config/defaults.hjson
+++ b/config/defaults.hjson
@@@ -35,10 -35,10 +35,12 @@@
    tls_enabled: true
    # json web token for authorization between server and client
    jwt_secret: "changeme"
 +  # path to built documentation
 +  docs_dir: "/app/documentation"
    # address where pictrs is available
    pictrs_url: "http://pictrs:8080"
+   # address where iframely is available
+   iframely_url: "http://iframely"
    # rate limits for various user actions, by user ip
    rate_limit: {
      # maximum number of messages created in interval
diff --cc lemmy_utils/src/settings.rs
index 8e073c94,3add60b3..960c48b8
--- a/lemmy_utils/src/settings.rs
+++ b/lemmy_utils/src/settings.rs
@@@ -13,9 -13,9 +13,10 @@@ pub struct Settings 
    pub bind: IpAddr,
    pub port: u16,
    pub tls_enabled: bool,
 +  pub docs_dir: PathBuf,
    pub jwt_secret: String,
    pub pictrs_url: String,
+   pub iframely_url: String,
    pub rate_limit: RateLimitConfig,
    pub email: Option<EmailConfig>,
    pub federation: FederationConfig,