update makefile

Makefile

@@ -1,4 +1,4 @@
-VERSION := 0.2.2
+VERSION := 0.2.3
 RELEASE := master
 
 # Application
@@ -56,6 +56,7 @@ help:
 	@echo "\t clean       \t- Deletes all files that are created by running buildout."
 	@echo "\t distclean   \t- Removes *all* files that are not controlled by 'git'.\n\t\t\tWARNING: use it *only* if you know what you do!"
 	@echo "\t sysinstall  \t- Installs system packages from requirements.sh. You can also call 'bash requirements.sh' directly."
+	@echo "\t passwd      \t- Generate password for 'phoenix-password' in custom.cfg."
 	@echo "\t docs        \t- Generates HTML documentation with Sphinx."
 	@echo "\t selfupdate  \t- Updates this Makefile."
 	@echo "\nSupervisor targets:\n"
@@ -139,11 +140,10 @@ conda_config: anaconda
 	@"$(ANACONDA_HOME)/bin/conda" config --set ssl_verify false
 	@"$(ANACONDA_HOME)/bin/conda" config --add channels defaults
 	@"$(ANACONDA_HOME)/bin/conda" config --add channels birdhouse
-	@"$(ANACONDA_HOME)/bin/conda" config --add channels pingucarsti
 
 .PHONY: conda_env
 conda_env: anaconda conda_config
-	@test -d $(PREFIX) || "$(ANACONDA_HOME)/bin/conda" create -m -p $(PREFIX) -c birdhouse --yes python=2.7.8 setuptools=14.3 curl pyopenssl genshi mako
+	@test -d $(PREFIX) || "$(ANACONDA_HOME)/bin/conda" create -m -p $(PREFIX) -c birdhouse --yes python setuptools ipython curl pyopenssl genshi mako
 
 .PHONY: conda_pinned
 conda_pinned: conda_env
@@ -195,6 +195,15 @@ buildclean:
 	@echo "Removing bootstrap.sh ..."
 	@test -e bootstrap.sh && rm -v bootstrap.sh
 
+.PHONY: bootstrap
+passwd:
+	@echo "Generate Phoenix password ..."
+	@echo "Enter a password with at least 8 characters."
+	@bash -c "source $(ANACONDA_HOME)/bin/activate $(CONDA_ENV);python -c 'from IPython.lib import passwd; print passwd(algorithm=\"sha256\")'"
+	@echo ""
+	@echo "Add this password to custom.cfg: phoenix-password = ..." 
+	@echo "Run 'make install restart' to activate this password." 
+
 .PHONY: test
 test:
 	@echo "Running tests (skip slow tests) ..."

bootstrap.sh

@@ -17,7 +17,7 @@ install_pkgs() {
     if [ -f /etc/debian_version ] ; then
         echo "Install Debian/Ubuntu packages for Birdhouse build ..."
         sudo apt-get update && sudo apt-get -y install python wget curl build-essential
-        sudo apt-get install vim-common # anaconda needs xxd
+        sudo apt-get -y install vim-common # anaconda needs xxd
     elif [ -f /etc/redhat-release ] ; then
         echo "Install CentOS packages for Birdhouse build ..."
         #sudo rpm -i http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm