YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

/var/www/xmpp-upload.{domain} -> /var/xmpp-upload/{domain}

Browse source
This commit is contained in:
Alexandre Aubin 2020-03-23 22:15:03 +01:00
parent 0bd717a21e
commit 27f6899b65
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/hooks/conf_regen/12-metronome
View file

@ -48,9 +48,9 @@ do_post_regen() {
for domain in $domain_list; do
mkdir -p "/var/lib/metronome/${domain//./%2e}/pep"
# http_upload directory must be writable by metronome and readable by nginx
mkdir -p "/var/www/xmpp-upload.${domain}/upload"
chmod g+s "/var/www/xmpp-upload.${domain}/upload"
chown -R metronome:www-data "/var/www/xmpp-upload.${domain}"
mkdir -p "/var/xmpp-upload/${domain}/upload"
chmod g+s "/var/xmpp-upload/${domain}/upload"
chown -R metronome:www-data "/var/xmpp-upload/${domain}"
done
# fix some permissions

2
data/templates/metronome/metronome.cfg.lua
View file

@ -144,7 +144,7 @@ Component "pubsub.{{ main_domain }}" "pubsub"
Component "xmpp-upload.{{ main_domain }}" "http_upload"
name = "{{ main_domain }} Sharing Service"
http_file_path = "/var/www/xmpp-upload.{{ main_domain }}/upload"
http_file_path = "/var/xmpp-upload/{{ main_domain }}/upload"
http_external_url = "https://xmpp-upload.{{ main_domain }}:443"
http_file_base_path = "/upload"
http_file_size_limit = 6*1024*1024

2
data/templates/nginx/server.tpl.conf
View file

@ -105,7 +105,7 @@ server {
server_name xmpp-upload.{{ domain }};
location /upload {
alias /var/www/xmpp-upload.{{ domain }}/upload;
alias /var/xmpp-upload/{{ domain }}/upload;
# Pass all requests to metronome, except for GET and HEAD requests.
limit_except GET HEAD {
proxy_pass http://localhost:5290;