free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'stretch' of https://github.com/bashrc/freedombone

This commit is contained in:
Bob Mottram 2018-01-29 23:17:06 +00:00
parent 2c7e4df3de 0ac2d76322
commit e460b617dd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedombone-app-pleroma
View File

@ -47,7 +47,7 @@ PLEROMA_CODE=
PLEROMA_PORT=4000 PLEROMA_PORT=4000
PLEROMA_ONION_PORT=8011 PLEROMA_ONION_PORT=8011
PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git" PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
PLEROMA_COMMIT='80f6ac412a632da090be9f3d86971eac0b95a53d' PLEROMA_COMMIT='c1fa1e8844c8eae1ad7638a2d7f9d00e8cd07ce8'
PLEROMA_ADMIN_PASSWORD= PLEROMA_ADMIN_PASSWORD=
PLEROMA_DIR=/etc/pleroma PLEROMA_DIR=/etc/pleroma
PLEROMA_SECRET_KEY="" PLEROMA_SECRET_KEY=""
@ -920,7 +920,7 @@ function install_pleroma {
echo ' # include snippets/well-known.conf;' >> $pleroma_nginx_site echo ' # include snippets/well-known.conf;' >> $pleroma_nginx_site
echo '}' >> $pleroma_nginx_site echo '}' >> $pleroma_nginx_site
else else
echo 'proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=100m inactive=80m use_temp_path=off;' >> $pleroma_nginx_site echo 'proxy_cache_path /tmp/pleroma-media-cache levels=1:2 keys_zone=pleroma_media_cache:10m max_size=100m inactive=80m use_temp_path=off;' > $pleroma_nginx_site
echo '' >> $pleroma_nginx_site echo '' >> $pleroma_nginx_site
fi fi
echo 'server {' >> $pleroma_nginx_site echo 'server {' >> $pleroma_nginx_site

1
src/freedombone-upgrade
View File

@ -102,6 +102,7 @@ if [ -d $PROJECT_DIR ]; then
tor_version=$(tor --version) tor_version=$(tor --version)
if [[ "$tor_version" == *' 0.2'* ]]; then if [[ "$tor_version" == *' 0.2'* ]]; then
echo 'N' | apt-get -yq -t stretch-backports install tor echo 'N' | apt-get -yq -t stretch-backports install tor
systemctl restart tor
fi fi
fi fi
fi fi