summary refs log tree commit diff
path: root/synapse_topology/view
diff options
context:
space:
mode:
authorJorik Schellekens <joriks@matrix.org>2019-08-09 17:25:52 +0100
committerJorik Schellekens <joriks@matrix.org>2019-08-28 15:59:53 +0100
commite00008186b29b4a1014b2b475119832063539e8e (patch)
tree87ca45955c39be24d86e4afca9f77e0937d34ef4 /synapse_topology/view
parentUse python instead (diff)
downloadsynapse-e00008186b29b4a1014b2b475119832063539e8e.tar.xz
Setup the secret key and start synapse.
Diffstat (limited to 'synapse_topology/view')
-rw-r--r--synapse_topology/view/webui/js/actions/index.js4
-rw-r--r--synapse_topology/view/webui/js/api/index.js2
-rw-r--r--synapse_topology/view/webui/js/index.jsx2
-rw-r--r--synapse_topology/view/webui/js/utils/yaml.js2
4 files changed, 5 insertions, 5 deletions
diff --git a/synapse_topology/view/webui/js/actions/index.js b/synapse_topology/view/webui/js/actions/index.js
index 0ea23b7d39..38955a4333 100644
--- a/synapse_topology/view/webui/js/actions/index.js
+++ b/synapse_topology/view/webui/js/actions/index.js
@@ -28,7 +28,7 @@ import {
 import {
   get_server_setup,
   post_server_name,
-  fetch_secret_key,
+  get_secretkey,
   post_cert_paths,
   post_certs,
   test_ports,
@@ -139,7 +139,7 @@ export const getting_secret_keys = () => ({
 
 export const get_secret_key = () => {
   return dispatch => {
-    fetch_secret_key().then(
+    get_secretkey().then(
       result => dispatch(set_secret_key(result)),
       error => dispatch(fail(error)),
     )
diff --git a/synapse_topology/view/webui/js/api/index.js b/synapse_topology/view/webui/js/api/index.js
index cfe57fef00..521a5a5393 100644
--- a/synapse_topology/view/webui/js/api/index.js
+++ b/synapse_topology/view/webui/js/api/index.js
@@ -63,7 +63,7 @@ export const test_ports = (ports) =>
     }
   ).then(res => res.json())
 
-export const fetch_secret_key = () =>
+export const get_secretkey = () =>
   fetchAbs(SECRET_KEY)
     .then(res => res.json())
     .then(json => json.secret_key)
diff --git a/synapse_topology/view/webui/js/index.jsx b/synapse_topology/view/webui/js/index.jsx
index 4f1d7794fe..aeff2d5c87 100644
--- a/synapse_topology/view/webui/js/index.jsx
+++ b/synapse_topology/view/webui/js/index.jsx
@@ -20,7 +20,7 @@ store.dispatch(startup());
 
 render(
   <Provider store={store}>
-    <img className={style.logo} src={logo} />
+    {/* <img className={style.logo} src={logo} /> */}
     <UI />
   </Provider>,
   document.getElementById("content")
diff --git a/synapse_topology/view/webui/js/utils/yaml.js b/synapse_topology/view/webui/js/utils/yaml.js
index bdc7e4d124..6b8dc5c6fb 100644
--- a/synapse_topology/view/webui/js/utils/yaml.js
+++ b/synapse_topology/view/webui/js/utils/yaml.js
@@ -102,7 +102,7 @@ export const base_config_to_synapse_config = config => {
   const conf = {
     server_name: config.servername,
     report_stats: config.report_stats,
-    log_config: config.config_dir + "/" + config.server_name + ".log.config",
+    log_config: config.config_dir + "/" + config.servername + ".log.config",
     media_store_path: config.config_dir + "/data/media_store",
     uploads_path: config.config_dir + "/data/uploads",
     pid_file: config.config_dir + "/data/homeserver.pid",