]> Untitled Git - lemmy.git/commitdiff
Merge pull request #1247 from knkski/iframely-url-setting
authorDessalines <dessalines@users.noreply.github.com>
Mon, 2 Nov 2020 03:44:28 +0000 (22:44 -0500)
committerGitHub <noreply@github.com>
Mon, 2 Nov 2020 03:44:28 +0000 (22:44 -0500)
Add iframely_url setting

1  2 
config/defaults.hjson
lemmy_utils/src/settings.rs

index 59b808f8d06d31e7d2a9aa24369de4c4eb3a7e5e,42222550273a1aceec2b28d1d78df93e6e422f2c..f23b1fb13ef206e9ac8be00c932609f6bdda8e11
    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
index 8e073c944e142fd64784680126d1a05e2c57d403,3add60b39ab72d21dc68212b3360829bdc7fc2af..960c48b85197c3a179122a5d6e8f432d9f944dc0
@@@ -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,