Changeset 2837

Show
Ignore:
Timestamp:
01/07/12 11:27:38 (4 months ago)
Author:
paparazzia
Message:

see #619 #651

Location:
trunk
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/hosting/UPGRADE

    r2836 r2837  
    99  EDIT file ./conf/conf_script  
    1010    - change VLM SVNBRANCH to V_0_19 
    11     - add "export VLMGSHHSURL=http://testing.virtual-loup-de-mer.org/gshhs/" 
     11    - add "export VLMGSHHSURL=http://testing.virtual-loup-de-mer.org/gshhs" 
     12    - add "export VLMURL=http://virtual-loup-de-mer.org" 
    1213 
    1314  RUN 
    … …  
    3435  RUN 
    3536    ./scripts/upgrade.sh 0.19 2 
    36  
    37   INSTALL 
    38     monitoring of health-status 
    3937 
    4038THE END 

  • trunk/hosting/conf/conf_script.dist

    r2836 r2837  
    5959export VLMGSHHSURL=http://testing.virtual-loup-de-mer.org/gshhs/ 
    6060 
     61#URL par défaut 
     62export VLMURL=http://v-l-m.org 
     63 
    6164########################################## 
    6265#Le reste n'est normalement pas à modifier 

  • trunk/hosting/scripts/maj_module.sh

    r2836 r2837  
    9797        echo 'OK !' 
    9898    fi 
     99    echo -n "Deleting tiles cache" 
     100    rm -Rf "$VLMCACHE/gshhstiles/*" 
    99101    cd $oldpwd 
    100102    ;; 

  • trunk/hosting/scripts/upgrades.d/up-0.19-2.sh

    r2682 r2837  
    55$VLMRACINE/scripts/maj_module.sh site 
    66$VLMRACINE/scripts/maj_module.sh jvlm 
     7$VLMRACINE/scripts/maj_module.sh clip_gshhs 
    78 
    89rm $VLMTEMP/cronvlm*.lock 

  • trunk/moteur/clean_tilescache.sh

    r2731 r2837  
    22 
    33. $VLMRACINE/conf/conf_script || exit 1 
    4  
    54TILESCACHEDIR=$VLMCACHE/gshhstiles 
    65 
    … …  
    1716cd ${TILESCACHEDIR} 
    1817 
    19 emptysum="40d1d7d1e1b9bcaae0d69a5900dabf85" 
    20  
    2118sea=0 
    2219nblinks=0 
    … …  
    2421    mkdir ${FIXEDTILESDIR} 
    2522    echo "Creating fixed dir" 
    26 else 
    27     if [ -f ${FIXEDTILESDIR}/${SEAFILE} ]; then 
    28         sea=1 
    29         nblinks=`ls -l ${FIXEDTILESDIR}/${SEAFILE} | awk '{ print $2}'` 
    30     fi 
     23fi 
     24if [ ! -f ${FIXEDTILESDIR}/${SEAFILE} ]; then 
     25    wget --output-document=${FIXEDTILESDIR}/${SEAFILE} "$VLMURL/gshhstiles.php?z=18&x=173651&y=116199&force=yes" 
     26fi 
     27 
     28if [ -f ${FIXEDTILESDIR}/${SEAFILE} ]; then 
     29    #emptysum="40d1d7d1e1b9bcaae0d69a5900dabf85" 
     30    emptysum=`md5sum ${FIXEDTILESDIR}/${SEAFILE}| awk '{print $1}'` 
     31    sea=1 
     32    nblinks=`ls -l ${FIXEDTILESDIR}/${SEAFILE} | awk '{ print $2}'` 
     33else  
     34    echo "!!! Unable to use sea.png""" 
     35    exit 2 
    3136fi 
    3237 
    … …  
    4247        echo "Is empty!" 
    4348        if [ "$sea" -eq "0" ]; then 
     49            #On recree le fichier sea.png s'il n'existe pas encore. 
    4450            mv $tilename ${FIXEDTILESDIR}/${SEAFILE} 
    4551            sea=1 

  • trunk/site/gshhstiles.php

    r2418 r2837  
    4646    header("Cache-Control: max-age=864000"); // default 10 days should be tunable. 
    4747    readfile($original); 
     48    exit(0); //To prevent bad spaces appended from php script 
    4849?> 
    49   
    50  
    51