diff --git a/client/src/components/context.vue b/client/src/components/context.vue
index db2de33..063cfeb 100644
--- a/client/src/components/context.vue
+++ b/client/src/components/context.vue
@@ -3,7 +3,7 @@
-
diff --git a/client/src/components/members.vue b/client/src/components/members.vue
index 5f8cf7f..8458339 100644
--- a/client/src/components/members.vue
+++ b/client/src/components/members.vue
@@ -4,7 +4,7 @@
- ![]()
+ ![]()
{{ child.data.member.displayname }}
-
-
+
@@ -15,7 +15,7 @@
>
-
-
+
diff --git a/client/src/components/context.vue b/client/src/components/context.vue index 063cfeb..29fcd83 100644 --- a/client/src/components/context.vue +++ b/client/src/components/context.vue @@ -3,7 +3,7 @@+
{{ child.data.member.displayname }}
-
-
+
@@ -15,7 +15,7 @@
>
From 9f8222962ee5cd105445e93916166b9c46c4f882 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Mon, 19 Oct 2020 18:33:23 +0200 Subject: [PATCH 07/10] Create apache-proxypass-config.md --- docs/apache-proxypass-config.md | 60 +++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 docs/apache-proxypass-config.md diff --git a/docs/apache-proxypass-config.md b/docs/apache-proxypass-config.md new file mode 100644 index 0000000..cf7ee56 --- /dev/null +++ b/docs/apache-proxypass-config.md @@ -0,0 +1,60 @@ +# Using Apache for proxy pass and SSL + +After successfully installing and running neko, you might want to get rid of the port in the url, use DNS instead of IP address and also having SSL. +This will remove the port from the URL and also enables HTTPS. +To do this, you have to get running apache server. Now you can go into the ```/etc/apache2/sites-available``` folder and create new config file for example ```neko.conf``` +After creating new config file, you can use this example config and paste it in. Some thing might vary on your machine so read through and modify if needed. +Bear in mind that your neko server doesn't have to run on the same computer as apache. They just have to be on the same network and then you replace localhost with correct internal IP. + +## Example apache config +``` ++ # The ServerName directive sets the request scheme, hostname and port that + # the server uses to identify itself. This is used when creating + # redirection URLs. In the context of virtual hosts, the ServerName + # specifies what hostname must appear in the request's Host: header to + # match this virtual host. For the default virtual host (this file) this + # value is not decisive as it is used as a last resort host regardless. + # However, you must set it for any further virtual host explicitly. + + # Paths of those modules might vary across different distros. + LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so + LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so + LoadModule proxy_wstunnel_module /usr/lib/apache2/modules/mod_proxy_wstunnel.so + + ServerName example.com + ServerAlias www.example.com + + ProxyRequests Off + ProxyPass / http://localhost:8080/ + ProxyPassReverse / http://localhost:8080/ + + RewriteEngine on + RewriteCond %{HTTP:Upgrade} websocket [NC] + RewriteCond %{HTTP:Connection} upgrade [NC] + RewriteRule /ws(.*) "ws://localhost:8080/ws$1" [P,L] + + # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, + # error, crit, alert, emerg. + # It is also possible to configure the loglevel for particular + # modules, e.g. + #LogLevel info ssl:warn + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + + # For most configuration files from conf-available/, which are + # enabled or disabled at a global level, it is possible to + # include a line for only one particular virtual host. For example the + # following line enables the CGI configuration for this host only + # after it has been globally disabled with "a2disconf". + #Include conf-available/serve-cgi-bin.conf + +``` + +After creating your new config file, just use ```sudo a2ensite neko.conf``` and then ```sudo systemctl reload apache2``` + +# Enabling SSL + +If you want to use SSL for your apache configuration, you can install certbot and use it with ```sudo certbot``` +Then you can just select both ```example.com``` and ```www.example.com``` and apply. This will copy your ```neko.conf``` file and creates one for SSL. From cad98a62a5bd7f1daf2c11980631bb14ba81a1f6 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Mon, 19 Oct 2020 18:43:19 +0200 Subject: [PATCH 08/10] Add syntaxe highlights --- docs/apache-proxypass-config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/apache-proxypass-config.md b/docs/apache-proxypass-config.md index cf7ee56..bce4ea5 100644 --- a/docs/apache-proxypass-config.md +++ b/docs/apache-proxypass-config.md @@ -7,7 +7,7 @@ After creating new config file, you can use this example config and paste it in. Bear in mind that your neko server doesn't have to run on the same computer as apache. They just have to be on the same network and then you replace localhost with correct internal IP. ## Example apache config -``` +```apache# The ServerName directive sets the request scheme, hostname and port that # the server uses to identify itself. This is used when creating From aa321965abfb181a33652f5e8d5e37a77d0c20c4 Mon Sep 17 00:00:00 2001 From: Jonathan Elias Caicedo