git.cweiske.de
/
phorkie.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add padding fix to edit page
[phorkie.git]
/
README.rst
diff --git
a/README.rst
b/README.rst
index 651e18121d9e56e56f68bd555e06df097db39dbc..ede03d0ba3ba1f824cec3d6321de983380ac9722 100644
(file)
--- a/
README.rst
+++ b/
README.rst
@@
-112,6
+112,7
@@
It is used to provide search capabilities and the list of recent pastes.
__ http://www.elasticsearch.org/
__ http://www.elasticsearch.org/
+
Setup
=====
Edit ``config.php``, setting the ``elasticsearch`` property to the HTTP URL
Setup
=====
Edit ``config.php``, setting the ``elasticsearch`` property to the HTTP URL
@@
-119,6
+120,7
@@
of the index, e.g. ::
http://localhost:9200/phorkie/
http://localhost:9200/phorkie/
+You must use a search namespace with Elasticsearch such as ``phorkie/``.
Run the index script to import all existing pastes into the index::
php scripts/index.php
Run the index script to import all existing pastes into the index::
php scripts/index.php
@@
-138,7
+140,7
@@
index, run the following command::
Phorkie will automatically re-index everything when ``setupcheck`` is enabled
in the configuration file.
Phorkie will automatically re-index everything when ``setupcheck`` is enabled
in the configuration file.
-You may also manually run the reindex
er
with::
+You may also manually run the reindex
ing script
with::
$ php scripts/index.php
$ php scripts/index.php
@@
-281,6
+283,8
@@
If you use nginx, place the following lines into your ``server`` block:
rewrite ^/([0-9]+)/tool/([^/]+)/(.+)$ /tool.php?id=$1&tool=$2&file=$3;
rewrite ^/new$ /new.php;
rewrite ^/([0-9]+)/tool/([^/]+)/(.+)$ /tool.php?id=$1&tool=$2&file=$3;
rewrite ^/new$ /new.php;
+ rewrite ^/feed/new$ /feed-new.php;
+ rewrite ^/feed/updated$ /feed-updated.php;
rewrite ^/list$ /list.php;
rewrite ^/list/([0-9]+)$ /list.php?page=$1;
rewrite ^/list$ /list.php;
rewrite ^/list/([0-9]+)$ /list.php?page=$1;