diff --git a/debian/changelog b/debian/changelog index 9531da28..28afc288 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.405.84) stable; urgency=low +hedera-web (1.405.85) stable; urgency=low * Initial Release. diff --git a/deploy b/deploy new file mode 100755 index 00000000..25af6507 --- /dev/null +++ b/deploy @@ -0,0 +1,5 @@ +#!/bin/bash +set -e + +vn-debuild +vn-deploy www1.static www2.static diff --git a/package.json b/package.json index da880f56..9649dcee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hedera-web", - "version": "1.405.84", + "version": "1.405.85", "description": "Verdnatura web page", "license": "GPL-3.0", "repository": { diff --git a/utils/deploy b/utils/deploy deleted file mode 100755 index cbb15060..00000000 --- a/utils/deploy +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -set -e - -baseDir=$(dirname "$0") -gitDir="$baseDir/.." -projectName=$(basename "$(realpath "$gitDir")") -buildDir="/tmp/git-deploy/$projectName" -srcDir="$buildDir/src" -repreproDir="/var/cache/reprepro" -codename="stable" -logFile="$buildDir/deploy.log" - -echo "Building source code." -echo " * Directory $buildDir" - -rm -f "$logFile" - -mkdir -p "$srcDir" -git --work-tree="$srcDir" --git-dir="$gitDir" checkout -f - -if [ -f "$srcDir/package.json" ] -then - echo "Installing Node dependencies." - (cd "$srcDir" && npm --silent install >> "$logFile") -fi - -if [ -f "$srcDir/debian/changelog" ] -then - echo "Cleaning last build." - rm -f $buildDir/*.deb - rm -f $buildDir/*.changes - rm -f $buildDir/*.build - (cd "$srcDir" && debian/rules clean >> "$logFile") - - echo "Building Debian packages." - (cd "$srcDir" && debuild -uc -us -b >> "$logFile") - - echo "Adding packages to repository." - packages="" - - cut -d" " -f1 "$srcDir/debian/files" | - while read debFile - do - if [[ ! "$debFile" =~ .*\.deb$ ]] - then - continue - fi - - packageName=$(echo $debFile | cut -d"_" -f1) - packages="$packages $packageName" - - echo " * Adding $debFile" - reprepro -b "$repreproDir" includedeb $codename "$buildDir/$debFile" >> "$logFile" - done -fi diff --git a/utils/upgrade b/utils/upgrade deleted file mode 100755 index 07bbbef9..00000000 --- a/utils/upgrade +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -e - -packages=$1 -hosts="www1.static.verdnatura.es www2.static.verdnatura.es" - -if [ -z "$packages" ] -then - echo "Usage: $(basename $0) package_name..." - exit 1 -fi - -# FIXME: Packages are not upgraded when config files are changed - -echo "Upgrading servers." - -for host in $hosts -do - echo " * Upgrading $host" - ssh root@$host "update-repo vn && apt-get install $packages >> /dev/null" -done diff --git a/web/html-service.php b/web/html-service.php index 525d3966..cb88ef93 100644 --- a/web/html-service.php +++ b/web/html-service.php @@ -44,6 +44,7 @@ class HtmlService extends Service $updateBrowser = FALSE; if (!isset ($_GET['skipBrowser']) + && isset($_SERVER['HTTP_USER_AGENT']) && ($browser = get_browser ($_SERVER['HTTP_USER_AGENT']))) { $browserVersion = (double) $browser->version; diff --git a/web/html.php b/web/html.php index 2a3293ad..c01d7b00 100644 --- a/web/html.php +++ b/web/html.php @@ -5,6 +5,8 @@ $version = $this->getVersion(); function getUrl ($fileName) { + global $version; + if (file_exists ($fileName)) $fileVersion = strftime ('%G%m%d%H%M%S', filemtime ($fileName)); else @@ -15,12 +17,12 @@ function getUrl ($fileName) function js ($fileName) { - return ''."\n"; + return ''."\n"; } function css ($fileName) { - return ''."\n"; + return ''."\n"; } function getWebpackAssets ()