From d4a70d8c1bb1091c9a42cd308d07a7e4ef0d191d Mon Sep 17 00:00:00 2001 From: Chris Hutchison Date: Thu, 19 Apr 2018 22:37:06 -0400 Subject: [PATCH] Revert "update" --- CHANGES.rst | 7 ++----- CONTRIBUTORS.txt | 26 +---------------------- Dockerfile | 33 ------------------------------ docs/contribute.rst | 2 ++ docs/docs/configuration/client.rst | 5 ++--- docs/docs/install.rst | 13 +----------- docs/docs/troubleshooting.rst | 6 ------ 7 files changed, 8 insertions(+), 84 deletions(-) delete mode 100644 Dockerfile diff --git a/CHANGES.rst b/CHANGES.rst index 5365c2e..2b290a6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,8 +4,7 @@ Changelog for Isso 0.10.7 (unreleased) ------------------- -- Fix Chinese translation & typo in CJK -- Fix link in moderation mails if isso is setup on a sub-url (e.g. domain.tld/comments/) +- Fix Chinese translation - Add Danish translation - Add Hungarian translation - Add Persian translation @@ -13,9 +12,7 @@ Changelog for Isso - Add links highlighting in comments - Add apidoc - Add rc.d script for FreeBSD -- Add the possibility to set CORS Origin through ISSO_CORS_ORIGIN environ variable -- Some tests/travis/documentation improvements and fixes + pep8 -- Improvement on german translation +- Some tests/travis/documentation improvements and fixes 0.10.6 (2016-09-22) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index ad1fc1e..0b5e649 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -51,36 +51,12 @@ In chronological order: * Added configuration to require email addresses (no validation) * Fix Vagrantfile -* Benoît Latinier @blatinier +* Benoît Latinier * Fix thread discovery * Added mandatory author - * Added admin interface * Ivan Pantic * Added vote levels -* Martin Schenck @schemar - * Improvement in the german translation - -* @cclauss - * Pep8 and drop of legacy supports (old python & debian version tested in travis) - * Make travis use pyflakes - -* Lucas Cimon @Lucas-C - * Added the possibility to define CORS origins through ISSO_CORS_ORIGIN environment variable - -* Yuchen Pei @ycpei - * Fix link in moderation emails when isso is installed in a sub URL - -* @Rocket1184 - * Fix typo in CJK translations - -* @vincentbernat - * Added documentation about data-isso-id attribute (overriding the standard isso-thread-id) - * Added multi-staged Dockerfile - -* @p-vitt & @M4a1x - * Documentation on troubleshooting for uberspace users - * [Your name or handle] <[email or website]> * [Brief summary of your changes] diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 3a8203c..0000000 --- a/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -# First, compile JS stuff -FROM node -WORKDIR /src/ -COPY . . -RUN npm install -g requirejs uglify-js jade bower -RUN make init js - -# Second, create virtualenv -FROM python:3-stretch -WORKDIR /src/ -COPY --from=0 /src . -RUN apt-get -qqy update && apt-get -qqy install python3-dev sqlite3 -RUN python3 -m venv /isso \ - && . /isso/bin/activate \ - && python setup.py install \ - && pip install gunicorn - -# Third, create final repository -FROM python:3-slim-stretch -WORKDIR /isso/ -COPY --from=1 /isso . - -# Configuration -VOLUME /db /config -EXPOSE 8080 -ENV ISSO_SETTINGS /config/isso.cfg -CMD ["/isso/bin/gunicorn", "-b", "0.0.0.0:8080", "-w", "4", "--preload", "isso.run"] - -# Example of use: -# -# docker build -t isso . -# docker run -it --rm -v /opt/isso:/config -v /opt/isso:/db -v $PWD:$PWD isso /isso/bin/isso -c \$ISSO_SETTINGS import disqus.xml -# docker run -d --rm --name isso -p 8080:8080 -v /opt/isso:/config -v /opt/isso:/db isso diff --git a/docs/contribute.rst b/docs/contribute.rst index c349a47..8a3886d 100644 --- a/docs/contribute.rst +++ b/docs/contribute.rst @@ -59,3 +59,5 @@ definitely need help: - delete or activate comments matching a filter (e.g. name, email, ip address) - close threads and remove threads completely + + - edit comments diff --git a/docs/docs/configuration/client.rst b/docs/docs/configuration/client.rst index 9328357..14f0c86 100644 --- a/docs/docs/configuration/client.rst +++ b/docs/docs/configuration/client.rst @@ -7,7 +7,6 @@ preferably in the script tag which embeds the JS: .. code-block:: html Furthermore you can override the automatic title detection inside -the embed tag, as well as the thread ID, e.g.: +the embed tag, e.g.: .. code-block:: html -
+
data-isso --------- diff --git a/docs/docs/install.rst b/docs/docs/install.rst index eb2ef35..44d829f 100644 --- a/docs/docs/install.rst +++ b/docs/docs/install.rst @@ -149,18 +149,7 @@ Prebuilt Packages * Fedora: https://copr.fedoraproject.org/coprs/jujens/isso/ — copr repository. Built from Pypi, includes a systemctl unit script. -Build a Docker image --------------------- - -You can get a Docker image by running ``docker build . -t -isso``. Assuming you have your configuration in ``/opt/isso``, you can -use the following command to spawn the Docker container: - -.. code-block:: sh - - ~> docker run -d --rm --name isso -p 127.0.0.1:8080:8080 -v /opt/isso:/config -v /opt/isso:/db isso - -Then, you can use a reverse proxy to expose port 8080. +* Docker Image: https://registry.hub.docker.com/u/bl4n/isso/ Install from Source ------------------- diff --git a/docs/docs/troubleshooting.rst b/docs/docs/troubleshooting.rst index a395a0a..20ee8dd 100644 --- a/docs/docs/troubleshooting.rst +++ b/docs/docs/troubleshooting.rst @@ -1,12 +1,6 @@ Troubleshooting =============== -For uberspace users -------------------- -Some uberspace users experienced problems with isso and they solved their -issue by adding `DirectoryIndex disabled` as the first line in the `.htaccess` -file for the domain the isso server is running on. - pkg_ressources.DistributionNotFound -----------------------------------