2.5.0 Beta 1

INSTALL

@@ -21,10 +21,6 @@ src/tests/simian/auth/gae_server.zip supplies the App Engine SDK so that all
 unit tests may run without requiring the SDK. To update this zip, download and
 zip the "google" folder within the latest Linux App Engine SDK.
 
-src/simian/client/gae_client.zip supplies a small portion of the App Engine
-SDK so that client functions may run without needing the full SDK on each
-client.
-
 However, you will need the full App Engine SDK so that you can upload the
 Simian site to your App Engine instance.
 

MANIFEST.in

@@ -1,12 +1,10 @@
 include src/simian/settings.py
-include src/simian/client/gae_client.zip
 recursive-exclude src/simian/mac/admin *
 recursive-exclude src/simian/mac/common *
 include src/simian/mac/common/__init__.py
 include src/simian/mac/common/hw.py
 recursive-exclude src/simian/mac/cron *
 recursive-exclude src/simian/mac/munki/handlers *
 recursive-exclude src/simian/mac/api *
-exclude src/simian/mac/main.py
 exclude src/simian/mac/munki/common.py
 exclude src/simian/mac/urls.py

Makefile

@@ -10,7 +10,7 @@ SDIST=${SDIST_TAR}.gz
 MUNKI_VERSION=2.5.1.2630
 MUNKI=munkitools-${MUNKI_VERSION}
 MUNKIFILE=${MUNKI}.pkg
-PYTHON_VERSION=2.6
+PYTHON_VERSION=2.7
 PYTHON=$(shell type -p python${PYTHON_VERSION})
 TS=$(shell date '+%s')
 BUILD_VERSION=$(shell (git rev-parse HEAD 2>/dev/null || echo ${SIMIAN_VERSION} | tr '.' '-') | cut -c1-12)
@@ -22,8 +22,9 @@ python_check:
 	@if [ ! -x "${PYTHON}" ]; then echo Cannot find ${PYTHON} ; exit 1 ; fi
 
 virtualenv: python_check
-	${PYTHON} -c 'import virtualenv' || \
-	sudo easy_install-${PYTHON_VERSION} -U virtualenv==1.10.1
+	${PYTHON} -c 'import virtualenv; exit(virtualenv.__version__ != "13.1.2")' || \
+	(sudo easy_install-${PYTHON_VERSION} -U virtualenv==13.1.2 && \
+	sudo easy_install-${PYTHON_VERSION} -U setuptools==18.6.1)
 
 VE: virtualenv python_check
 	[ -d VE ] || \
@@ -116,12 +117,9 @@ install_name_tool:
 
 m2crypto:
 	for egg in \
-	M2Crypto-0.21.1-py2.6-macosx-10.6-universal.egg \
-	M2Crypto-0.22.3-py2.6-macosx-10.7-intel.egg \
-	M2Crypto-0.22.3-py2.6-macosx-10.8-x86_64.egg \
-	M2Crypto-0.22.3-py2.6-macosx-10.9-x86_64.egg \
-	M2Crypto-0.22.3-py2.6-macosx-10.10-intel.egg \
-	M2Crypto-0.22.3-py2.6-macosx-10.11-intel.egg ; do \
+	M2Crypto-0.22.3-py2.7-macosx-10.9-intel.egg \
+	M2Crypto-0.22.3-py2.7-macosx-10.10-intel.egg \
+	M2Crypto-0.22.3-py2.7-macosx-10.11-intel.egg ; do \
 	[[ -f "simian_$${egg}" ]] || curl -o "simian_$${egg}" "https://storage.googleapis.com/m2crypto_eggs/$${egg}" ; \
 	done
 
@@ -134,12 +132,7 @@ ${SIMIAN}.dmg: os_check ${SDIST} clean_contents contents.tar.gz m2crypto vep
 	-version ${SIMIAN_VERSION} \
 	-pyver ${PYTHON_VERSION} \
 	-vep install_name_tool \
-	-R simian_M2Crypto-*-10.6-*.egg \
-	-R simian_M2Crypto-*-10.7-*.egg \
-	-R simian_M2Crypto-*-10.8-*.egg \
-	-R simian_M2Crypto-*-10.9-*.egg \
-	-R simian_M2Crypto-*-10.10-*.egg \
-	-R simian_M2Crypto-*-10.11-*.egg \
+	-R simian_M2Crypto-*-10.*-*.egg \
 	-R PyYAML-*.egg \
 	-R WebOb-*.egg \
 	-R google_apputils-*.egg \
@@ -164,12 +157,7 @@ ${SIMIAN}.pkg: os_check ${SDIST} clean_contents contents.tar.gz m2crypto vep
 	-version ${SIMIAN_VERSION} \
 	-pyver ${PYTHON_VERSION} \
 	-vep install_name_tool \
-	-R simian_M2Crypto-*-10.6-*.egg \
-	-R simian_M2Crypto-*-10.7-*.egg \
-	-R simian_M2Crypto-*-10.8-*.egg \
-	-R simian_M2Crypto-*-10.9-*.egg \
-	-R simian_M2Crypto-*-10.10-*.egg \
-	-R simian_M2Crypto-*-10.11-*.egg \
+	-R simian_M2Crypto-*-10.*-*.egg \
 	-R PyYAML-*.egg \
 	-R WebOb-*.egg \
 	-R google_apputils-*.egg \
@@ -194,12 +182,7 @@ ${SIMIAN}-and-${MUNKI}.pkg: os_check ${SDIST} clean_contents m2crypto add_munkic
 	-version ${SIMIAN_VERSION}.${MUNKI_VERSION} \
 	-pyver ${PYTHON_VERSION} \
 	-vep install_name_tool \
-	-R simian_M2Crypto-*-10.6-*.egg \
-	-R simian_M2Crypto-*-10.7-*.egg \
-	-R simian_M2Crypto-*-10.8-*.egg \
-	-R simian_M2Crypto-*-10.9-*.egg \
-	-R simian_M2Crypto-*-10.10-*.egg \
-	-R simian_M2Crypto-*-10.11-*.egg \
+	-R simian_M2Crypto-*-10.*-*.egg \
 	-R PyYAML-*.egg \
 	-R WebOb-*.egg \
 	-R google_apputils-*.egg \
@@ -222,12 +205,7 @@ ${SIMIAN}-and-${MUNKI}.dmg: os_check ${SDIST} clean_contents m2crypto add_munkic
 	-version ${SIMIAN_VERSION}.${MUNKI_VERSION} \
 	-pyver ${PYTHON_VERSION} \
 	-vep install_name_tool \
-	-R simian_M2Crypto-*-10.6-*.egg \
-	-R simian_M2Crypto-*-10.7-*.egg \
-	-R simian_M2Crypto-*-10.8-*.egg \
-	-R simian_M2Crypto-*-10.9-*.egg \
-	-R simian_M2Crypto-*-10.10-*.egg \
-	-R simian_M2Crypto-*-10.11-*.egg \
+	-R simian_M2Crypto-*-10.*-*.egg \
 	-R PyYAML-*.egg \
 	-R WebOb-*.egg \
 	-R google_apputils-*.egg \

README.md

@@ -1,5 +1,6 @@
 ### Overview
 
+**Note 1: OS X 10.6, 10.7, 10.8 support dropped (22 April 2016) **
 **Note 2: Simian now supports Munki2 categories!**
 
 Simian is an enterprise-class Mac OS X software deployment solution hosted on Google App Engine (why [App Engine](../../wiki/AppEngineAtAGlance)?). It scales to any enterprise fleet size automatically, and offers a future proof client extended from the active [Munki open-source project](https://github.com/munki/munki).

postflight

@@ -197,7 +197,7 @@ cp ${RESOURCES}/roots.pem ${INSTALL_DIR}/${VE_DIR}/
 ### update munki configuration
 
 echo Begin section: Harmless "configuration not found" messages may follow
-server=`${VE_PYTHON} -c "from simian import settings ; print '%s.%s' % (settings.SUBDOMAIN, settings.DOMAIN)"`
+server=`${VE_PYTHON} -c "from simian import settings ; print '%s' % settings.SERVER_HOSTNAME"`
 defaults write /Library/Preferences/ManagedInstalls SoftwareRepoURL "https://${server}"
 echo End section
 

postinstall

@@ -198,7 +198,7 @@ cp "$(pwd)/roots.pem" ${INSTALL_DIR}/${VE_DIR}/
 ### update munki configuration
 
 echo Begin section: Harmless "configuration not found" messages may follow
-server=`${VE_PYTHON} -c "from simian import settings ; print '%s.%s' % (settings.SUBDOMAIN, settings.DOMAIN)"`
+server=`${VE_PYTHON} -c "from simian import settings ; print '%s' % settings.SERVER_HOSTNAME`
 defaults write /Library/Preferences/ManagedInstalls SoftwareRepoURL "https://${server}"
 echo End section