Resolve conflicts

3 files changed, 102 insertions, 0 deletions

diff --git a/priv/templates/robots_txt.eex b/priv/templates/robots_txt.eex
new file mode 100644
index 000000000..1af3c47ee
--- /dev/null
+++ b/priv/templates/robots_txt.eex
@@ -0,0 +1,2 @@
+User-Agent: *
+Disallow: <%= if indexable, do: "", else: "/" %>
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
new file mode 100644
index 000000000..7f275279e
--- /dev/null
+++ b/priv/templates/sample_config.eex
@@ -0,0 +1,88 @@
+# Pleroma instance configuration
+
+# NOTE: This file should not be committed to a repo or otherwise made public
+# without removing sensitive information.
+
+<%= if Code.ensure_loaded?(Config) or not Code.ensure_loaded?(Mix.Config) do
+  "import Config"
+else
+  "use Mix.Config"
+end %>
+
+config :pleroma, Pleroma.Web.Endpoint,
+   url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],
+   secret_key_base: "<%= secret %>",
+   signing_salt: "<%= signing_salt %>"
+
+config :pleroma, :instance,
+  name: "<%= name %>",
+  email: "<%= email %>",
+  notify_email: "<%= notify_email %>",
+  limit: 5000,
+  registrations_open: true,
+  dynamic_configuration: <%= db_configurable? %>
+
+config :pleroma, :media_proxy,
+  enabled: false,
+  redirect_on_failure: true
+  #base_url: "https://cache.pleroma.social"
+
+config :pleroma, Pleroma.Repo,
+  adapter: Ecto.Adapters.Postgres,
+  username: "<%= dbuser %>",
+  password: "<%= dbpass %>",
+  database: "<%= dbname %>",
+  hostname: "<%= dbhost %>",
+  pool_size: 10
+
+# Configure web push notifications
+config :web_push_encryption, :vapid_details,
+  subject: "mailto:<%= email %>",
+  public_key: "<%= web_push_public_key %>",
+  private_key: "<%= web_push_private_key %>"
+
+config :pleroma, :database, rum_enabled: <%= rum_enabled %>
+config :pleroma, :instance, static_dir: "<%= static_dir %>"
+config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
+
+# Enable Strict-Transport-Security once SSL is working:
+# config :pleroma, :http_security,
+#   sts: true
+
+# Configure S3 support if desired.
+# The public S3 endpoint is different depending on region and provider,
+# consult your S3 provider's documentation for details on what to use.
+#
+# config :pleroma, Pleroma.Uploaders.S3,
+#   bucket: "some-bucket",
+#   public_endpoint: "https://s3.amazonaws.com"
+#
+# Configure S3 credentials:
+# config :ex_aws, :s3,
+#   access_key_id: "xxxxxxxxxxxxx",
+#   secret_access_key: "yyyyyyyyyyyy",
+#   region: "us-east-1",
+#   scheme: "https://"
+#
+# For using third-party S3 clones like wasabi, also do:
+# config :ex_aws, :s3,
+#   host: "s3.wasabisys.com"
+
+
+# Configure Openstack Swift support if desired.
+#
+# Many openstack deployments are different, so config is left very open with
+# no assumptions made on which provider you're using. This should allow very
+# wide support without needing separate handlers for OVH, Rackspace, etc.
+#
+# config :pleroma, Pleroma.Uploaders.Swift,
+#  container: "some-container",
+#  username: "api-username-yyyy",
+#  password: "api-key-xxxx",
+#  tenant_id: "<openstack-project/tenant-id>",
+#  auth_url: "https://keystone-endpoint.provider.com",
+#  storage_url: "https://swift-endpoint.prodider.com/v1/AUTH_<tenant>/<container>",
+#  object_url: "https://cdn-endpoint.provider.com/<container>"
+#
+
+config :joken, default_signer: "<%= jwt_secret %>"
diff --git a/priv/templates/sample_psql.eex b/priv/templates/sample_psql.eex
new file mode 100644
index 000000000..627839a68
--- /dev/null
+++ b/priv/templates/sample_psql.eex
@@ -0,0 +1,12 @@
+CREATE USER <%= dbuser %> WITH ENCRYPTED PASSWORD '<%= dbpass %>';
+CREATE DATABASE <%= dbname %> OWNER <%= dbuser %>;
+\c <%= dbname %>;
+--Extensions made by ecto.migrate that need superuser access
+CREATE EXTENSION IF NOT EXISTS citext;
+CREATE EXTENSION IF NOT EXISTS pg_trgm;
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+<%= if rum_enabled do
+  "CREATE EXTENSION IF NOT EXISTS rum;"
+else
+""
+end %>