This repository has been archived by the owner on Sep 17, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 24
Move spamhaus to postgresql #13
Merged
PandiPanda69
merged 9 commits into
ovh:devel
from
HugoDelval:move-spamhaus-to-postgresql
Oct 4, 2017
Merged
Move spamhaus to postgresql #13
PandiPanda69
merged 9 commits into
ovh:devel
from
HugoDelval:move-spamhaus-to-postgresql
Oct 4, 2017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also change shebang from /bin/sh -> /bin/bash and improve Readme
HugoDelval
force-pushed
the
move-spamhaus-to-postgresql
branch
3 times, most recently
from
September 26, 2017 15:57
0e19ac8
to
203838e
Compare
HugoDelval
force-pushed
the
move-spamhaus-to-postgresql
branch
from
September 26, 2017 16:00
203838e
to
246b204
Compare
PandiPanda69
approved these changes
Oct 4, 2017
README.md
Outdated
@@ -73,7 +79,7 @@ To setup this little tool, you'll need: | |||
shell scripts) | |||
* Python 2.7+ | |||
* Packages `python-dev` and `python-pip` | |||
* A MongoDB database (2.6.x or greater with TLS support*) | |||
* A PostgreSQL database (2.6.x or greater with TLS support*) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MongoDB is still required, isn't it?
Psql version should also be changed (9.2+)
README.md
Outdated
* `MONGO_DB`: name of the MongoDB database | ||
* `MONGO_USER`: MongoDB user | ||
* `MONGO_PASSWORD`: MongoDB password | ||
* `DB_HOST`: ip or domain of your PostgreSQL DB host |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about Mongo for the FBL?
PandiPanda69
suggested changes
Oct 4, 2017
@@ -34,7 +34,7 @@ class StorageServiceBase(object): | |||
""" | |||
Interface defining a storage service used to store documents. | |||
For example, an implementation might store those data in OpenStack | |||
Swift, MongoDB, RDBMS or filesystem. | |||
Swift, a DB, RDBMS or filesystem. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- MongoDB
reputation/db/mongo.py
Outdated
settings.MONGODB['host'], | ||
settings.MONGODB['port'], | ||
settings.MONGODB['db'] | ||
settings.DB['user'], |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DB -> MONGO_DB is clearer don't you think?
Thank you for the PR ! 👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit: