From 6226b1632a1bae8cce7dcbc10e759cea5b53ec72 Mon Sep 17 00:00:00 2001
From: Luke Hoersten <luke@hoersten.org>
Date: Sun, 3 May 2020 12:57:47 -0500
Subject: Completed writefreely role

---
 writefreely/templates/config.ini.j2           | 49 +++++++++++++++++++++------
 writefreely/templates/writefreely.service.j2  | 11 ------
 writefreely/templates/writefreely@.service.j2 | 12 +++++++
 3 files changed, 50 insertions(+), 22 deletions(-)
 delete mode 100644 writefreely/templates/writefreely.service.j2
 create mode 100644 writefreely/templates/writefreely@.service.j2

(limited to 'writefreely/templates')

diff --git a/writefreely/templates/config.ini.j2 b/writefreely/templates/config.ini.j2
index 59eb224..bb5fe7f 100644
--- a/writefreely/templates/config.ini.j2
+++ b/writefreely/templates/config.ini.j2
@@ -1,44 +1,71 @@
 [server]
 hidden_host          =
-port                 = {{writefreely_server_port}}
+port                 = {{writefreely_port}}
 bind                 = localhost
 tls_cert_path        =
 tls_key_path         =
-autocert             = true
+autocert             = false
 templates_parent_dir =
 static_parent_dir    =
 pages_parent_dir     =
 keys_parent_dir      =
+hash_seed            =
 
 [database]
 type     = sqlite3
-filename = {{writefreely_db_name}}.db
+filename = writefreely.db
 username =
 password =
-database =
+database = writefreely
 host     = localhost
 port     = 3306
 
 [app]
 site_name          = {{writefreely_site_name}}
-site_description   = {{writefreely_site_desc}}
-host               = {{writefreely_site_host}}
+site_description   =
+host               = {{writefreely_url}}
 theme              = write
 editor             =
 disable_js         = false
 webfonts           = true
-landing            =
+landing            = /read
 simple_nav         = false
 wf_modesty         = false
 chorus             = false
+forest             = false
 disable_drafts     = false
-single_user        = true
+single_user        = false
 open_registration  = false
 min_username_len   = 3
 max_blogs          = 1
 federation         = true
 public_stats       = true
 private            = false
-local_timeline     = false
-user_invites       =
-default_visibility =
+local_timeline     = true
+user_invites       = admin
+default_visibility = public
+update_checks      = false
+
+[oauth.slack]
+client_id          =
+client_secret      =
+team_id            =
+callback_proxy     =
+callback_proxy_api =
+
+[oauth.writeas]
+client_id          =
+client_secret      =
+auth_location      =
+token_location     =
+inspect_location   =
+callback_proxy     =
+callback_proxy_api =
+
+[oauth.gitlab]
+client_id          =
+client_secret      =
+host               =
+display_name       =
+callback_proxy     =
+callback_proxy_api =
diff --git a/writefreely/templates/writefreely.service.j2 b/writefreely/templates/writefreely.service.j2
deleted file mode 100644
index 0515872..0000000
--- a/writefreely/templates/writefreely.service.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=WriteFreely %I Instance
-After=syslog.target network.target
-
-[Service]
-WorkingDirectory=/run/writefreely/%i
-ExecStart=/usr/local/bin/writefreely -c /etc/writefreely/%i.conf
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/writefreely/templates/writefreely@.service.j2 b/writefreely/templates/writefreely@.service.j2
new file mode 100644
index 0000000..bf0d03b
--- /dev/null
+++ b/writefreely/templates/writefreely@.service.j2
@@ -0,0 +1,12 @@
+[Unit]
+Description=WriteFreely %I Instance
+After=syslog.target network.target
+
+[Service]
+WorkingDirectory={{writefreely_dir}}/%i/
+ExecStart=/usr/local/bin/writefreely
+Restart=always
+User={{writefreely_user}}
+
+[Install]
+WantedBy=multi-user.target
-- 
cgit v1.2.3