envs
/
ops
mirror of https://git.envs.net/envs/ops.git
1
0
Fork 0
Code Releases Activity

update from server state

This commit is contained in:
creme 2023-12-04 18:42:30 +00:00
parent 674cb3bd83
commit c3b7791f45
6 changed files with 85 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/cron.d/backup
View File

@ -4,5 +4,4 @@
SHELL=/bin/sh
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

2
etc/cron.d/tilde_admin
View File

@ -4,4 +4,4 @@
SHELL=/bin/sh
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

4
etc/nginx/nginx.conf
View File

@ -86,8 +86,8 @@ http {
# borrowed from Apache
# (Could use $host instead of $server_name to log vhost aliases separately)
log_format vhost_combined '$server_name $remote_addr - $remote_user [$time_local] '
'"$request" $status $body_bytes_sent '
'"$http_referer" "$http_user_agent"';
'"$request" $status $body_bytes_sent '
'"$http_referer" "$http_user_agent"';
log_format vcombined '$host:$server_port '
'$remote_addr - $remote_user [$time_local] '

46
etc/nginx/sites-available/envs.net.conf
View File

@ -65,47 +65,7 @@ server {
# }
## matrix
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"}';
}
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;
}
include snippets/matrix.conf;
## users
location ~ ^/(~|u/)(?<user>[\w-]+)(?<user_uri>/.*)?$ {
@ -169,6 +129,10 @@ server {
return 301 https://help.envs.net/;
}
location /register {
return 301 https://envs.net/signup/;
}
location /irc {
return 301 https://envs.net/chat/irc/;
}

76
etc/nginx/snippets/matrix.conf Normal file
View File

@ -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;
}

2
var/tilde/admins

@ -1 +1 @@
Subproject commit 918bc0406fb046ad3baaf1b27708ef5e59c24752
Subproject commit 073ce09fcff03144a840bb7728a45b47f7fa1487