From 96b583d63b88ae41dbd63a60c15a2124fa639987 Mon Sep 17 00:00:00 2001 From: Matthew Scragg Date: Fri, 6 Nov 2015 22:05:02 -0600 Subject: [PATCH] update scripts and readme with dependencies --- README.md | 8 ++++---- docker/Dockerfile | 2 +- install.sh | 2 +- setup.py | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f223cb2..afa19d0 100644 --- a/README.md +++ b/README.md @@ -42,11 +42,11 @@ You will need the following packages to get started: #### Ubuntu - sudo apt-get install -y python-pip python-dev libxml2-dev libxslt1-dev zlib1g-dev libffi-dev libyaml-dev libssl-dev + sudo apt-get install -y python-pip python-dev libxml2-dev libxslt1-dev zlib1g-dev libffi-dev libyaml-dev libssl-dev libsasl2-dev libldap2-dev #### CentOS / RHEL - yum install -y python-pip python-devel.x86_64 libxslt-devel.x86_64 libxml2-devel.x86_64 libffi-devel.x86_64 libyaml-devel.x86_64 libxslt-devel.x86_64 zlib-devel.x86_64 openssl-devel.x86_64 python-pbr gcc + yum install -y python-pip python-devel.x86_64 libxslt-devel.x86_64 libxml2-devel.x86_64 libffi-devel.x86_64 libyaml-devel.x86_64 libxslt-devel.x86_64 zlib-devel.x86_64 openssl-devel.x86_64 openldap2-devel cyrus-sasl-devel python-pbr gcc #### OSX / Windows @@ -68,7 +68,7 @@ The easiest way. Install it using Python Package Index: sudo apt-get install -y software-properties-common python-software-properties sudo add-apt-repository -y ppa:chris-lea/node.js sudo apt-get update - sudo apt-get install -y nodejs python-pip python-dev libxml2-dev libxslt1-dev zlib1g-dev libffi-dev libyaml-dev libssl-dev + sudo apt-get install -y nodejs python-pip python-dev libxml2-dev libxslt1-dev zlib1g-dev libffi-dev libyaml-dev libssl-dev libsasl2-dev libldap2-dev sudo npm install -g bower bower install @@ -292,7 +292,7 @@ After your config is in place use the following commands: sudo restart realms-wiki -### Developement mode +### Development mode This will start the server in the foreground with auto reloaded enabled: diff --git a/docker/Dockerfile b/docker/Dockerfile index c00277e..6b4be36 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM realms/base # Packages -RUN apt-get update && apt-get install -y build-essential python-pip python-virtualenv python-dev zlib1g-dev libffi-dev libyaml-dev +RUN apt-get update && apt-get install -y build-essential python-pip python-virtualenv python-dev zlib1g-dev libffi-dev libyaml-dev libldap2-dev libsasl2-dev # lxml deps # libxml2-dev libxslt1-dev diff --git a/install.sh b/install.sh index 8edca84..93077e2 100755 --- a/install.sh +++ b/install.sh @@ -25,7 +25,7 @@ sudo apt-get update sudo apt-get install -y python build-essential pkg-config git \ python-pip python-virtualenv python-dev zlib1g-dev libldap2-dev libsasl2-dev \ -libffi-dev libyaml-dev libssl-dev nodejs +libffi-dev libyaml-dev libssl-dev libldap2-dev libsasl2-dev nodejs # Create swap file because ES eats up RAM and 14.04 doesn't have swap by default sudo fallocate -l 1G /swapfile diff --git a/setup.py b/setup.py index 193c596..15be6d5 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ setup(name='realms-wiki', 'gunicorn==19.3', 'itsdangerous==0.24', 'markdown2==2.3.0', + 'python-ldap==2.4.22', 'simplejson==3.6.3' ], entry_points={