diff --git a/debian/resources/nginx.sh b/debian/resources/nginx.sh index f0c51a0..1a71b18 100755 --- a/debian/resources/nginx.sh +++ b/debian/resources/nginx.sh @@ -28,6 +28,13 @@ elif [ ."$os_name" = ."Ubuntu" ]; then which add-apt-repository || apt-get install -y software-properties-common LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php fi +elif [ ."$cpu_architecture" = ."arm" ]; then + #Pi2 and Pi3 Raspbian + #Odroid + if [ ."$os_codename" = ."jessie" ]; then + echo "deb http://packages.moopi.uk/debian jessie main" > /etc/apt/sources.list.d/moopi.list + wget -O - http://packages.moopi.uk/debian/moopi.gpg.key | apt-key add - + fi else #9.x - */stretch/ #8.x - */jessie/ @@ -40,9 +47,9 @@ fi apt-get update #use php version 5 for arm -if [ .$cpu_architecture = .'arm' ]; then - php_version=5 -fi +#if [ .$cpu_architecture = .'arm' ]; then +# php_version=5 +#fi #install dependencies apt-get install -y nginx diff --git a/debian/resources/postgres.sh b/debian/resources/postgres.sh index 25705df..b3fd3f6 100755 --- a/debian/resources/postgres.sh +++ b/debian/resources/postgres.sh @@ -19,7 +19,7 @@ echo "Install PostgreSQL and create the database and users\n" #use the system database repo for arm if [ .$cpu_architecture = .'arm' ]; then - database_repo="system" + database_repo="sip247" fi #included in the distribution @@ -45,6 +45,14 @@ if [ ."$database_repo" = ."2ndquadrant" ]; then apt-get install -y --force-yes sudo postgresql-bdr-9.4 postgresql-bdr-9.4-bdr-plugin postgresql-bdr-contrib-9.4 fi +#sip247 arm repository +if [ ."$database_repo" = ."sip247" ]; then + echo 'deb http://repo.sip247.com/debian/postgresql-armhf jessie main' > /etc/apt/sources.list.d/pgsql-sip247.list + wget --quiet -O - http://repo.sip247.com/debian/sip247.com.gpg.key | apt-key add - + apt-get update && apt-get upgrade -y + apt-get install -y --force-yes sudo postgresql +fi + #systemd systemctl daemon-reload systemctl restart postgresql