mirror of https://git.envs.net/envs/ops.git
update from server state
This commit is contained in:
parent
674cb3bd83
commit
c3b7791f45
|
@ -4,5 +4,4 @@
|
||||||
SHELL=/bin/sh
|
SHELL=/bin/sh
|
||||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root
|
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root
|
||||||
|
|
||||||
#13 1,13 * * * root /root/backup-server.sh
|
|
||||||
13 1 * * * root /root/backup-server.sh
|
13 1 * * * root /root/backup-server.sh
|
||||||
|
|
|
@ -4,4 +4,4 @@
|
||||||
SHELL=/bin/sh
|
SHELL=/bin/sh
|
||||||
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
|
||||||
|
|
||||||
5 0 * * * root make -C /var/tilde/admins/ DEST_DIR=/var/ DEST_OWNER=root DEST_GROUP=www-data >/dev/null 2>&1
|
#5 0 * * * root make -C /var/tilde/admins/ DEST_DIR=/var/ DEST_OWNER=root DEST_GROUP=www-data >/dev/null 2>&1
|
||||||
|
|
|
@ -86,8 +86,8 @@ http {
|
||||||
# borrowed from Apache
|
# borrowed from Apache
|
||||||
# (Could use $host instead of $server_name to log vhost aliases separately)
|
# (Could use $host instead of $server_name to log vhost aliases separately)
|
||||||
log_format vhost_combined '$server_name $remote_addr - $remote_user [$time_local] '
|
log_format vhost_combined '$server_name $remote_addr - $remote_user [$time_local] '
|
||||||
'"$request" $status $body_bytes_sent '
|
'"$request" $status $body_bytes_sent '
|
||||||
'"$http_referer" "$http_user_agent"';
|
'"$http_referer" "$http_user_agent"';
|
||||||
|
|
||||||
log_format vcombined '$host:$server_port '
|
log_format vcombined '$host:$server_port '
|
||||||
'$remote_addr - $remote_user [$time_local] '
|
'$remote_addr - $remote_user [$time_local] '
|
||||||
|
|
|
@ -65,47 +65,7 @@ server {
|
||||||
# }
|
# }
|
||||||
|
|
||||||
## matrix
|
## matrix
|
||||||
location /.well-known/matrix/support {
|
include snippets/matrix.conf;
|
||||||
add_header Access-Control-Allow-Origin '*';
|
|
||||||
add_header Content-Type application/json;
|
|
||||||
return 200 '{"admins": [{"matrix_id": "@creme:envs.net", "email_address": "hostmaster@envs.net", "role": "admin"}], "support_page": "https://matrix.to/#/#envs:envs.net"}';
|
|
||||||
}
|
|
||||||
|
|
||||||
location /.well-known/matrix/server {
|
|
||||||
add_header Access-Control-Allow-Origin '*';
|
|
||||||
add_header Content-Type application/json;
|
|
||||||
return 200 '{"m.server": "matrix.envs.net:443"}';
|
|
||||||
}
|
|
||||||
|
|
||||||
location /.well-known/matrix/client {
|
|
||||||
add_header Access-Control-Allow-Origin '*';
|
|
||||||
add_header Content-Type application/json;
|
|
||||||
return 200 '{"m.homeserver": {"base_url": "https://matrix.envs.net"}, "m.integrations": {"managers": [{"ui_url": "https://dimension.envs.net/riot", "api_url": "https://dimension.envs.net/api/v1/scalar"}, {"ui_url": "https://scalar.vector.im/", "api_url": "https://scalar.vector.im/api"}]}, "m.integrations_widget": {"url": "https://dimension.envs.net/riot", "data": {"api_url": "https://dimension.envs.net/api/v1/scalar"}}, "m.tile_server": {"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=jrKVgM1ozvdgREfvtZ8X"}}';
|
|
||||||
}
|
|
||||||
|
|
||||||
location ^~ /_matrix/media {
|
|
||||||
return 302 https://matrix.envs.net$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
location ^~ /_matrix/maubot {
|
|
||||||
include proxy_params;
|
|
||||||
proxy_ssl_name $http_host;
|
|
||||||
proxy_ssl_server_name on;
|
|
||||||
|
|
||||||
proxy_pass https://matrix.envs.net;
|
|
||||||
}
|
|
||||||
|
|
||||||
location ^~ /_matrix/maubot/v1/logs {
|
|
||||||
include proxy_params;
|
|
||||||
proxy_ssl_name $http_host;
|
|
||||||
proxy_ssl_server_name on;
|
|
||||||
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "Upgrade";
|
|
||||||
proxy_pass https://matrix.envs.net;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
## users
|
## users
|
||||||
location ~ ^/(~|u/)(?<user>[\w-]+)(?<user_uri>/.*)?$ {
|
location ~ ^/(~|u/)(?<user>[\w-]+)(?<user_uri>/.*)?$ {
|
||||||
|
@ -169,6 +129,10 @@ server {
|
||||||
return 301 https://help.envs.net/;
|
return 301 https://help.envs.net/;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location /register {
|
||||||
|
return 301 https://envs.net/signup/;
|
||||||
|
}
|
||||||
|
|
||||||
location /irc {
|
location /irc {
|
||||||
return 301 https://envs.net/chat/irc/;
|
return 301 https://envs.net/chat/irc/;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,76 @@
|
||||||
|
# matrix/support
|
||||||
|
location /.well-known/matrix/support {
|
||||||
|
add_header Access-Control-Allow-Origin '*';
|
||||||
|
add_header Content-Type application/json;
|
||||||
|
return 200 '{
|
||||||
|
"admins": [
|
||||||
|
{
|
||||||
|
"matrix_id": "@creme:envs.net",
|
||||||
|
"email_address": "hostmaster@envs.net",
|
||||||
|
"role": "admin"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"support_page": "https://matrix.to/#/#envs:envs.net",
|
||||||
|
"abuse_reports": "https://matrix.to/#/#abuse:envs.net"
|
||||||
|
}';
|
||||||
|
}
|
||||||
|
|
||||||
|
# matrix/server
|
||||||
|
location /.well-known/matrix/server {
|
||||||
|
add_header Access-Control-Allow-Origin '*';
|
||||||
|
add_header Content-Type application/json;
|
||||||
|
return 200 '{
|
||||||
|
"m.server": "matrix.envs.net:443"
|
||||||
|
}';
|
||||||
|
}
|
||||||
|
|
||||||
|
# matrix/client
|
||||||
|
location /.well-known/matrix/client {
|
||||||
|
add_header Access-Control-Allow-Origin '*';
|
||||||
|
add_header Content-Type application/json;
|
||||||
|
return 200 '{
|
||||||
|
"m.homeserver": {
|
||||||
|
"base_url": "https://matrix.envs.net"
|
||||||
|
},
|
||||||
|
"m.tile_server": {
|
||||||
|
"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=jrKVgM1ozvdgREfvtZ8X"
|
||||||
|
}
|
||||||
|
}';
|
||||||
|
}
|
||||||
|
|
||||||
|
##
|
||||||
|
location ^~ /_matrix {
|
||||||
|
add_header Access-Control-Allow-Origin '*';
|
||||||
|
add_header Content-Type application/json;
|
||||||
|
return 404 '{
|
||||||
|
"errcode": "M_NOT_FOUND",
|
||||||
|
"error": "There are no Matrix endpoints here. Perhaps you forgot to resolve the client-server API URL?",
|
||||||
|
"solution": "Go to matrix.envs.net",
|
||||||
|
"spec": "https://spec.matrix.org/v1.9/server-server-api/#resolving-server-names"
|
||||||
|
}';
|
||||||
|
}
|
||||||
|
|
||||||
|
# media
|
||||||
|
location ^~ /_matrix/media {
|
||||||
|
return 302 https://matrix.envs.net$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
# maubot
|
||||||
|
location ^~ /_matrix/maubot {
|
||||||
|
include proxy_params;
|
||||||
|
proxy_ssl_name $http_host;
|
||||||
|
proxy_ssl_server_name on;
|
||||||
|
|
||||||
|
proxy_pass https://matrix.envs.net;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ^~ /_matrix/maubot/v1/logs {
|
||||||
|
include proxy_params;
|
||||||
|
proxy_ssl_name $http_host;
|
||||||
|
proxy_ssl_server_name on;
|
||||||
|
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "Upgrade";
|
||||||
|
proxy_pass https://matrix.envs.net;
|
||||||
|
}
|
|
@ -1 +1 @@
|
||||||
Subproject commit 918bc0406fb046ad3baaf1b27708ef5e59c24752
|
Subproject commit 073ce09fcff03144a840bb7728a45b47f7fa1487
|
Loading…
Reference in New Issue