浏览代码

Remove documentation referencing Cygwin (#3873)

tags/v0.33.6rc1
Amber Brown 5 年前
committed by GitHub
父节点
当前提交
3f0d8e6b09
找不到此签名对应的密钥 GPG 密钥 ID: 4AEE18F83AFDEB23
共有 3 个文件被更改,包括 10 次插入31 次删除
  1. +1
    -0
      .gitignore
  2. +7
    -31
      README.rst
  3. +2
    -0
      changelog.d/3873.misc

+ 1
- 0
.gitignore 查看文件

@@ -4,6 +4,7 @@

.DS_Store
_trial_temp/
_trial_temp*/
logs/
dbs/
*.egg


+ 7
- 31
README.rst 查看文件

@@ -157,7 +157,7 @@ if you prefer.

In case of problems, please see the _`Troubleshooting` section below.

There is an offical synapse image available at
There is an offical synapse image available at
https://hub.docker.com/r/matrixdotorg/synapse/tags/ which can be used with
the docker-compose file available at `contrib/docker <contrib/docker>`_. Further information on
this including configuration options is available in the README on
@@ -459,37 +459,13 @@ https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/misc/matrix-

Windows Install
---------------
Synapse can be installed on Cygwin. It requires the following Cygwin packages:

- gcc
- git
- libffi-devel
- openssl (and openssl-devel, python-openssl)
- python
- python-setuptools

The content repository requires additional packages and will be unable to process
uploads without them:

- libjpeg8
- libjpeg8-devel
- zlib

If you choose to install Synapse without these packages, you will need to reinstall
``pillow`` for changes to be applied, e.g. ``pip uninstall pillow`` ``pip install
pillow --user``

Troubleshooting:

- You may need to upgrade ``setuptools`` to get this to work correctly:
``pip install setuptools --upgrade``.
- You may encounter errors indicating that ``ffi.h`` is missing, even with
``libffi-devel`` installed. If you do, copy the ``.h`` files:
``cp /usr/lib/libffi-3.0.13/include/*.h /usr/include``
- You may need to install libsodium from source in order to install PyNacl. If
you do, you may need to create a symlink to ``libsodium.a`` so ``ld`` can find
it: ``ln -s /usr/local/lib/libsodium.a /usr/lib/libsodium.a``

If you wish to run or develop Synapse on Windows, the Windows Subsystem For
Linux provides a Linux environment on Windows 10 which is capable of using the
Debian, Fedora, or source installation methods. More information about WSL can
be found at https://docs.microsoft.com/en-us/windows/wsl/install-win10 for
Windows 10 and https://docs.microsoft.com/en-us/windows/wsl/install-on-server
for Windows Server.

Troubleshooting
===============


+ 2
- 0
changelog.d/3873.misc 查看文件

@@ -0,0 +1,2 @@
Remove documentation regarding installation on Cygwin, the use of WSL is
recommended instead.

正在加载...
取消
保存