Corrected the debian distribution sources. (5469d6d0) · Commits · Greppy / greppy.org-docker

assets/init

+1 −11

Original line number	Diff line number	Diff line
		@@ -179,17 +179,7 @@ case "$1" in
		appHelp
		;;
		*)
		if [ -x $1 ]; then
		$1
		else
		prog=$(which $1)
		if [ -n "${prog}" ] ; then
		shift 1
		$prog $@
		else
		appHelp
		fi
		fi
		exec "$@"
		;;
		esac

assets/install

+18 −14

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ set -e
		# Config variables
		# ------------------------------------------------------

		USE_NPM_CACHE=1
		USE_NPM_CACHE=0
		USE_APT_CACHE=1

		GREPPY_GLOB_VERSION=0.7.3
		@@ -32,24 +32,30 @@ if [ "$USE_NPM_CACHE" = 1 ]; then
		echo 'Setup npm cache proxy ...'
		npm config set proxy http://storage.lan:28080/
		npm config set https-proxy http://storage.lan:28080/
		npm config set strict-ssl false
		npm config set strict-'/mnt/backup/mongodb/'ssl false
		echo 'Done.'
		fi

		echo 'Setup cache proxy sources.list ...'
		if [ "$USE_APT_CACHE" = 1 ]; then
		cat > /etc/apt/sources.list <<EOF
		deb http://storage.lan:3142/ftp.de.debian.org/debian stable main contrib non-free
		deb http://storage.lan:3142/ftp.de.debian.org/debian jessie main contrib non-free
		deb http://storage.lan:3142/ftp.debian.org/debian/ wheezy-updates main contrib non-free
		deb http://storage.lan:3142/security.debian.org/ wheezy/updates main contrib non-free
		deb http://storage.lan:3142/ftp.de.debian.org/debian/ wheezy-backports main contrib non-free
		deb http://storage.lan:3142/ftp.debian.org/debian jessie-backports main
		deb http://storage.lan:3142/deb.debian.org/debian/ jessie-updates main contrib non-free
		deb http://storage.lan:3142/deb.debian.org/debian-security jessie/updates main
		EOF
		else
		cat > /etc/apt/sources.list <<EOF
		deb http://ftp.de.debian.org/debian stable main contrib non-free
		deb http://ftp.de.debian.org/debian jessie main contrib non-free
		deb http://ftp.debian.org/debian/ wheezy-updates main contrib non-free
		deb http://security.debian.org/ wheezy/updates main contrib non-free
		deb http://ftp.de.debian.org/debian/ wheezy-backports main contrib non-free
		deb http://ftp.debian.org/debian jessie-backports main
		deb http://deb.debian.org/debian/ jessie-updates main contrib non-free
		deb http://deb.debian.org/debian-security jessie/updates main
		EOF
		fi
		echo 'Done.'
		@@ -69,8 +75,10 @@ echo 'Done.'

		echo 'Install build and system dependencies ...'
		apt-get --no-install-recommends -qy -t wheezy-backports install \
		build-essential python2.7 screen wget openjdk-7-jre-headless locales sudo \
		nginx-full supervisor
		build-essential python2.7 screen wget openjdk-7-jre-headless \
		supervisor locales sudo git
		apt-get --no-install-recommends -qy install \
		nginx-full
		echo 'Done.'

		echo 'Setup locales ...'
		@@ -78,27 +86,26 @@ echo 'Done.'
		locale-gen en_US.UTF-8
		dpkg-reconfigure locales
		echo 'Done.'
		) &
		jobApt=$!
		)

		# Run each global npm install in as job - for parallel execution
		(
		echo 'Install global npm greppy package ...'
		npm install -g greppy@${GREPPY_GLOB_VERSION}
		npm install -g greppy@${GREPPY_GLOB_VERSION} --unsafe
		echo 'Done.'
		) &
		jobNpmGreppy=$!

		(
		echo 'Install global npm bower package ...'
		npm install -g bower@${BOWER_GLOB_VERSION}
		npm install -g bower@${BOWER_GLOB_VERSION} --unsafe
		echo 'Done.'
		) &
		jobNpmBower=$!

		(
		echo 'Install global npm grunt-cli package ...'
		npm install -g grunt-cli@${GRUNTCLI_GLOB_VERSION}
		npm install -g grunt-cli@${GRUNTCLI_GLOB_VERSION} --unsafe
		echo 'Done.'
		) &
		jobNpmGruntCli=$!
		@@ -107,9 +114,6 @@ jobNpmGruntCli=$!
		# Setup configs and runtume environment
		# ------------------------------------------------------

		# Wait for the apt job - we need wget for the git-export
		wait "$jobApt"

		# Run this stuff as job - for parallel execution
		(
		echo 'Setup static supervisor configs ...'