소스 검색

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

Bob Mottram 7 년 전
부모
커밋
e460b617dd
2개의 변경된 파일3개의 추가작업 그리고 2개의 파일을 삭제
  1. 2
    2
      src/freedombone-app-pleroma
  2. 1
    0
      src/freedombone-upgrade

+ 2
- 2
src/freedombone-app-pleroma 파일 보기

47
 PLEROMA_PORT=4000
47
 PLEROMA_PORT=4000
48
 PLEROMA_ONION_PORT=8011
48
 PLEROMA_ONION_PORT=8011
49
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
49
 PLEROMA_REPO="https://git.pleroma.social/pleroma/pleroma.git"
50
-PLEROMA_COMMIT='80f6ac412a632da090be9f3d86971eac0b95a53d'
50
+PLEROMA_COMMIT='c1fa1e8844c8eae1ad7638a2d7f9d00e8cd07ce8'
51
 PLEROMA_ADMIN_PASSWORD=
51
 PLEROMA_ADMIN_PASSWORD=
52
 PLEROMA_DIR=/etc/pleroma
52
 PLEROMA_DIR=/etc/pleroma
53
 PLEROMA_SECRET_KEY=""
53
 PLEROMA_SECRET_KEY=""
920
         echo '  # include snippets/well-known.conf;' >> $pleroma_nginx_site
920
         echo '  # include snippets/well-known.conf;' >> $pleroma_nginx_site
921
         echo '}' >> $pleroma_nginx_site
921
         echo '}' >> $pleroma_nginx_site
922
     else
922
     else
923
-        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
923
+        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
924
         echo '' >> $pleroma_nginx_site
924
         echo '' >> $pleroma_nginx_site
925
     fi
925
     fi
926
     echo 'server {' >> $pleroma_nginx_site
926
     echo 'server {' >> $pleroma_nginx_site

+ 1
- 0
src/freedombone-upgrade 파일 보기

102
         tor_version=$(tor --version)
102
         tor_version=$(tor --version)
103
         if [[ "$tor_version" == *' 0.2'* ]]; then
103
         if [[ "$tor_version" == *' 0.2'* ]]; then
104
             echo 'N' | apt-get -yq -t stretch-backports install tor
104
             echo 'N' | apt-get -yq -t stretch-backports install tor
105
+            systemctl restart tor
105
         fi
106
         fi
106
     fi
107
     fi
107
 fi
108
 fi