diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..aaa4088 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,35 @@ +name: 🧪 Release + +on: + release: + types: ['published'] + + +jobs: + build: + runs-on: ubuntu-latest + steps: + - + uses: actions/checkout@v2 + - + name: Extract tag + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: opengisch/lizmap:${{ env.RELEASE_VERSION }} diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 5eed65d..03ce571 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,124 @@ +FROM ubuntu:22.04 +LABEL opengisch.image.authors=="Clemens Rudert" -FROM debian:jessie -MAINTAINER Julien Ancelin / docker-lizmap +ENV DEBIAN_FRONTEND noninteractive RUN apt-get -y update \ - && apt-get -t jessie install -y python-simplejson python-software-properties xauth htop vim curl ntp ntpdate ssl-cert\ - apache2 apache2-mpm-worker apache2-mpm-prefork apache2-bin apache2-data libapache2-mod-fcgid libapache2-mod-php5 \ - php5 php5-common php5-cgi php5-curl php5-cli php5-sqlite php5-gd php5-pgsql unzip\ - && apt-get clean \ + && apt-get install -y software-properties-common \ + && add-apt-repository -y universe + # && add-apt-repository ppa:ondrej/php + +RUN apt-get -y update \ + && apt-get install -y --fix-missing \ + python3-simplejson \ + xauth \ + htop \ + nano \ + curl \ + ntp \ + ntpdate \ + ssl-cert \ + openssl \ + software-properties-common \ + apache2 libapache2-mod-fcgid \ + php-fpm \ + php \ + php-curl \ + php-cli \ + php-pdo \ + php-pgsql \ + php-sqlite3 \ + php-gd \ + php-xmlrpc \ + php-xml \ + php-ldap\ + php-date \ + # php-zlib \ + sqlite3 \ + postgresql-client \ + cron certbot python3-certbot-apache \ + unzip \ + rsync \ + zlib1g + +RUN apt-get clean \ && rm -r /var/lib/apt/lists/* - -RUN a2dismod php5; a2enmod actions; a2enmod fcgid ; a2enmod ssl; a2enmod rewrite; a2enmod headers; \ - a2enmod deflate; a2enmod php5 -ENV LIZMAPVERSION master -COPY files/ /home/files/ +# Get php composer +RUN curl -sS https://getcomposer.org/installer -o /tmp/composer-setup.php && \ + HASH=`curl -sS https://composer.github.io/installer.sig` && \ + echo $HASH && \ + php -r "if (hash_file('SHA384', '/tmp/composer-setup.php') === '$HASH') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" && \ + php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer + +ARG LE_domain="example.com" +ARG LE_email="info@example.com" +ARG LE_staging='true' +ARG LE_on='false' + +ENV LE_domain=$LE_domain +ENV LE_email=$LE_email +ENV LE_staging=$LE_staging +ENV LE_on=$LE_on + +# this can be overriden at build time with --build-arg lizmap_version=release_3_2 +ARG lizmap_version=3.6.7 +ENV LIZMAPVERSION=$lizmap_version + +# setup apache modules +RUN a2dismod mpm_prefork mpm_event; \ + a2enmod actions alias ssl rewrite headers deflate mpm_worker; \ + a2enmod fcgid proxy_fcgi; + +# copy config +COPY conf/apache2.conf /etc/apache2/ +COPY conf/mod_deflate.conf /etc/apache2/conf-available/ +COPY conf/fcgid.conf /etc/apache2/mods-enabled/ +COPY conf/default-ssl.conf /etc/apache2/sites-available/ +COPY conf/000-default.conf /etc/apache2/sites-available/ -ADD https://github.com/3liz/lizmap-web-client/archive/$LIZMAPVERSION.zip /var/www/ -RUN /home/files/setup.sh - -VOLUME ["/var/www/websig/lizmap/var" , "/home"] +# enable self signed SSL +RUN mkdir /etc/apache2/ssl +RUN make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /etc/apache2/ssl/apache.pem +RUN a2ensite default-ssl + +# install lizmap +RUN echo "Downloading https://github.com/3liz/lizmap-web-client/releases/download/$LIZMAPVERSION/lizmap-web-client-$LIZMAPVERSION.zip" +RUN mkdir -p /var/www/ \ + && curl -SL https://github.com/3liz/lizmap-web-client/releases/download/$LIZMAPVERSION/lizmap-web-client-$LIZMAPVERSION.zip > lizmap-web-client-$LIZMAPVERSION.zip && \ + unzip -q lizmap-web-client-$LIZMAPVERSION.zip && \ + rsync -a lizmap-web-client-$LIZMAPVERSION/* /var/www && \ + rm -rf lizmap-web-client-$LIZMAPVERSION && \ + rm -rf lizmap-web-client-$LIZMAPVERSION.zip +# set default configuration +RUN cp /var/www/lizmap/var/config/profiles.ini.php.dist /var/www/lizmap/var/config/profiles.ini.php +COPY conf/lizmapConfig.ini.php /var/www/lizmap/var/config/ +COPY conf/localconfig.ini.php /var/www/lizmap/var/config/ + +# backup default var folder, it will be copied by docker-entrypoints.sh into /var/www/lizmap/var at first start, +# if the directory is empty +RUN mv /var/www/lizmap/var var/www/lizmap/var_install + +# use default composer.json and install the extra modules +RUN cp /var/www/lizmap/my-packages/composer.json.dist /var/www/lizmap/my-packages/composer.json +ENV COMPOSER_ALLOW_SUPERUSER=1 +RUN composer require --working-dir=/var/www/lizmap/my-packages "jelix/saml-module" + +RUN mkdir -p /io/data/ + +VOLUME ["/var/www/lizmap/var" , "/io"] EXPOSE 80 443 -CMD /start.sh + +# Add crontab file in the cron directory +ADD conf/crontab /etc/cron.d/cache-cron +# Give execution rights on the cron job +RUN chmod 0644 /etc/cron.d/cache-cron +# Apply cron job +RUN crontab /etc/cron.d/cache-cron +# Create the log file to be able to run tail +RUN touch /var/log/cron.log + + +COPY conf/docker-entrypoint.sh /usr/local/bin/ +#RUN chmod u+x /bin/docker-entrypoint.sh +CMD ["docker-entrypoint.sh"] diff --git a/README.md b/README.md index 1cbbe22..f9ed72f 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,21 @@ docker-lizmap ============= -![docker_lizmap](https://cloud.githubusercontent.com/assets/6421175/25778701/68e9a536-3306-11e7-9196-84247b04eb92.png) -__________________________________________________________________ - -LizMap est une solution complète de publication de cartes QGIS sur Internet. - LizMap is a complete Internet QGIS map publishing. +___________________________________________________________________________ -____________________________________________________________________ +Building image: +--------------- +docker build --build-arg lizmap_version=3.6.7 -t=opengisch/lizmap:3.6.7 . + +Using image: +--------------- With Docker-compose: * Create a docker-compose.yml and changing the directory path if necessary (home/lizmap/lizmap_project): -https://github.com/jancelin/docker-lizmap/blob/master/docker-compose.yml +https://github.com/opengisch/docker-lizmap/blob/master/docker-compose.yml * UP @@ -27,18 +28,52 @@ docker-compose up -d * Now config lizmap on web : ``` -http://ip/websig/lizmap/www/admin.php/config +http://localhost/admin.php/config ``` * change URL WMS: >> http://qgiserver/cgi-bin/qgis_mapserv.fcgi -* Add **/home/** for looking your geo projects +* Add **/io/qgis/** for looking your geo projects ![config](https://cloud.githubusercontent.com/assets/6421175/11306233/e945f342-8fb0-11e5-9906-4010b9398ef1.png) * http://docs.3liz.com/fr/ +Upgrading from Lizmap 3.5 +------------------------- + +If you want to reuse a database containing tables of Lizmap 3.5, create a directory somewhere, +for example `./lizmap-previous-config`, and copy these files into it: + +- at least the `installer.ini.php` of the Lizmap 3.5 installation (stored originally into `lizmap/var/config`) +- the `lizmapConfig.ini.php` file if you want to retrieve the list of projects +- the `profiles.ini.php` file if there are specific connection profiles +- the `localconfig.ini.php` and `liveconfig.ini.php` if you want to retrieve some specific configuration, but + you should remove from them any reference to modules that are not used anymore into your new lizmap container. +- if you are using a sqlite database, the `jauth.db` database file (stored originally into `lizmap/var/db`) + +Modify the `docker-compose.yml` file to mount the `./lizmap-previous-config` directory at `/var/www/lizmap/previous-config` +for the lizmap image. For example: + +``` +services: + lizmap: + ... + volumes: + - ./projects:/io/data:ro + - var:/var/www/lizmap/var + - ./lizmap-previous-config/:/var/www/lizmap/previous-config +``` + +Launch docker compose. It will install the `installer.ini.php` and the `jauth.db`, and other configuration files if +there are present, and then it will launch the Lizmap installer which will migrate data if needed. + +Stop the containers and remove the mount on `/var/www/lizmap/previous-config`, else it will overwrite new data +at the next start, with the old database and old configuration files. + + + ------------------------------- Lizmap Web Application generates dynamically a web map application (php/html/css/js) with the help of Qgis Server ( QGIS Server Tutorial ). You can configure one web map per Qgis project with the QGIS LizMap Plugin. diff --git a/files/apache.conf b/conf/000-default.conf similarity index 76% rename from files/apache.conf rename to conf/000-default.conf index 53071db..79674fe 100644 --- a/files/apache.conf +++ b/conf/000-default.conf @@ -9,7 +9,7 @@ #ServerName www.example.com ServerAdmin webmaster@localhost - DocumentRoot /var/www + DocumentRoot /var/www/lizmap/www # Available loglevels: trace8, ..., trace1, debug, info, notice, warn, # error, crit, alert, emerg. @@ -27,13 +27,17 @@ # after it has been globally disabled with "a2disconf". #Include conf-available/serve-cgi-bin.conf -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - -Options ExecCGI FollowSymLinks -Require all granted -AddHandler fcgid-script .fcgi - + ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ + + Options ExecCGI FollowSymLinks + Require all granted + AddHandler fcgid-script .fcgi + + + # 2.4.10+ can proxy to unix socket + SetHandler "proxy:unix:/var/run/php/php8.1-fpm.sock|fcgi://localhost/" + # vim: syntax=apache ts=4 sw=4 sts=4 sr noet diff --git a/files/apache2.conf b/conf/apache2.conf similarity index 100% rename from files/apache2.conf rename to conf/apache2.conf diff --git a/conf/crontab b/conf/crontab new file mode 100644 index 0000000..75c4d24 --- /dev/null +++ b/conf/crontab @@ -0,0 +1 @@ +0 */12 * * * certbot renew >/dev/null 2>&1 diff --git a/files/apache_https.conf b/conf/default-ssl.conf similarity index 100% rename from files/apache_https.conf rename to conf/default-ssl.conf diff --git a/conf/docker-entrypoint.sh b/conf/docker-entrypoint.sh new file mode 100755 index 0000000..cc9c82f --- /dev/null +++ b/conf/docker-entrypoint.sh @@ -0,0 +1,83 @@ +#!/bin/bash +set -e +#generate config file +VARCONFIG="/var/www/lizmap/var/config" +PREVIOUSCONFIG="/var/www/lizmap/previous-config" + +echo "LE_on:" $LE_on +echo "LE_staging:" $LE_staging +echo "LE_email:" $LE_email +echo "LE_domain:" $LE_domain + +if [[ ! -d $VARCONFIG ]]; then + # the var volume is empty, let's fill it with default configuration files and missing directories + echo "Creating Config file in /var" + cp -avr /var/www/lizmap/var_install/* /var/www/lizmap/var +fi + +if [[ -d $PREVIOUSCONFIG ]]; then + # there is a volume containing the installer.ini.php file and the jauth.db file of + # a previous version of Lizmap, let's install it. + if [[ -f $PREVIOUSCONFIG/installer.ini.php ]]; then + cp $PREVIOUSCONFIG/installer.ini.php $VARCONFIG/ + fi + if [[ -f $PREVIOUSCONFIG/localconfig.ini.php ]]; then + cp $PREVIOUSCONFIG/localconfig.ini.php $VARCONFIG/ + fi + if [[ -f $PREVIOUSCONFIG/liveconfig.ini.php ]]; then + cp $PREVIOUSCONFIG/liveconfig.ini.php $VARCONFIG/ + fi + if [[ -f $PREVIOUSCONFIG/profiles.ini.php ]]; then + cp $PREVIOUSCONFIG/profiles.ini.php $VARCONFIG/ + fi + if [[ -f $PREVIOUSCONFIG/lizmapConfig.ini.php ]]; then + cp $PREVIOUSCONFIG/lizmapConfig.ini.php $VARCONFIG/ + fi + if [[ -f $PREVIOUSCONFIG/jauth.db ]]; then + cp $PREVIOUSCONFIG/jauth.db /var/www/lizmap/var/db/ + fi +fi + +# Apache gets grumpy about PID files pre-existing +rm -f /run/apache2/apache2.pid + +service php8.1-fpm start + +if [[ $LE_on == 'true' ]]; then + + if [[ $LE_staging == 'true' ]]; then + echo "LE will use staging certificate" + STAGING='--test-cert' + fi + LE_CONF=/etc/apache2/sites-enabled/000-default-le-ssl.conf + if [[ ! -f "$LE_CONF" ]]; then + /usr/sbin/apachectl start + echo "LE need to create conf files. Issuing:" + set -x + certbot --non-interactive --apache --redirect --agree-tos --domains $LE_domain --email $LE_email $STAGING + set +x + /usr/sbin/apachectl stop + sleep 5 + fi +fi + +# launch the configurator. In case this is an upgrade of Lizmap, it will +# launch the migration of configuration file if needed +php /var/www/lizmap/install/configurator.php + +# activate extra modules +php /var/www/lizmap/install/configurator.php saml +php /var/www/lizmap/install/configurator.php samladmin + +# launch the installer, it will launch modules/lizmap installers if +# lizmap/var was empty or it will launch module updaters if needed.. +php /var/www/lizmap/install/installer.php + +# remove cache and temporary files, to be sure that they will be regenerated +# with the updated configuration and source files +/var/www/lizmap/install/clean_vartmp.sh +#set-rights +/var/www/lizmap/install/set_rights.sh www-data www-data + +cron +exec /usr/sbin/apachectl -DFOREGROUND diff --git a/files/fcgid.conf b/conf/fcgid.conf similarity index 85% rename from files/fcgid.conf rename to conf/fcgid.conf index 15e08f3..248d7e5 100644 --- a/files/fcgid.conf +++ b/conf/fcgid.conf @@ -1,8 +1,9 @@ # this file will overwrite default file: /etc/apache2/mods-available/fcgid.conf - - AddHandler fcgid-script .fcgi + + AddHandler fcgid-script .fcgi + FcgidConnectTimeout 300 FcgidIOTimeout 300 FcgidMaxProcessesPerClass 50 @@ -12,5 +13,4 @@ BusyTimeout 300 FcgidInitialEnv QGIS_AUTH_DB_DIR_PATH /tmp/auth/db/ FcgidInitialEnv QGIS_AUTH_PASSWORD_FILE /tmp/auth/master/qgis_auth_master_password.txt - diff --git a/files/jauth.db b/conf/jauth.db similarity index 100% rename from files/jauth.db rename to conf/jauth.db diff --git a/files/lizmapConfig.ini.php b/conf/lizmapConfig.ini.php similarity index 71% rename from files/lizmapConfig.ini.php rename to conf/lizmapConfig.ini.php index e6ef795..f35f376 100644 --- a/files/lizmapConfig.ini.php +++ b/conf/lizmapConfig.ini.php @@ -4,27 +4,30 @@ ;Services ;list the different map services (servers, generic parameters, etc.) [services] -wmsServerURL="http://qgiserver/cgi-bin/qgis_mapserv.fcgi" +wmsServerURL="http://qgisserver/ows/" ;List of URL available for the web client -onlyMaps=off + +; cache cacheStorageType=redis ;cacheStorageType=sqlite => store cached images in one sqlite file per repo/project/layer ;cacheStorageType=file => store cached images in one folder per repo/project/layer. The root folder is /tmp/ cacheRedisHost=redisD cacheRedisPort=6379 +cacheRedisDb=1 +cacheRedisKeyPrefix=lm cacheExpiration=0 ; default cache expiration : the default time to live of data, in seconds. ; 0 means no expiration, max : 2592000 seconds (30 days) -proxyMethod=php +cacheRootDirectory="/tmp" +; cache root directory where cache files will be stored. must be writable + +proxyMethod=curl ; php -> use the built in file_get_contents method ; curl-> use curl. It must be installed. debugMode=1 ; debug mode ; on = print debug messages in lizmap/var/log/messages.log ; off = no lizmap debug messages -cacheRootDirectory="/tmp/" -; cache root directory where cache files will be stored -; must be writable ; path to find repositories ; rootRepositories="path" @@ -32,15 +35,21 @@ ; relativeWMSPath=0 -appName=Lizmap -qgisServerVersion=2.18 +appName="Lizmap WebGIS" +qgisServerVersion=3.0 wmsMaxWidth=3000 wmsMaxHeight=3000 relativeWMSPath=0 -cacheRedisDb=1 -cacheRedisKeyPrefix=a + +onlyMaps=off +projectSwitcher=on +requestProxyEnabled=0 +requestProxyType=http +requestProxyNotForDomain="localhost,127.0.0.1" +adminContactEmail="postmaster@localhost" +; googleAnalyticsID=UA-1234-1 [repository:demo] -label=Demo -path="/home/" +label=Main +path="/io/data/" allowUserDefinedThemes=1 diff --git a/files/localconfig.ini.php b/conf/localconfig.ini.php similarity index 92% rename from files/localconfig.ini.php rename to conf/localconfig.ini.php index a36d95f..54337d2 100644 --- a/files/localconfig.ini.php +++ b/conf/localconfig.ini.php @@ -2,7 +2,8 @@ ;for security reasons , don't remove or modify the first line ; put here configuration variables that are specific to this installation - +[urlengine] +basePath="/" ; chmod for files created by Lizmap and Jelix ;chmodFile=0664 @@ -13,7 +14,7 @@ [modules] ;; uncomment it if you want to use ldap for authentication ;; see documentation to complete the ldap configuration -;ldapdao.access=1 +;ldapdao.access=2 [coordplugin_auth] diff --git a/conf/mod_deflate.conf b/conf/mod_deflate.conf new file mode 100644 index 0000000..cde0f7f --- /dev/null +++ b/conf/mod_deflate.conf @@ -0,0 +1,14 @@ + + # Insert filter + SetOutputFilter DEFLATE + # Netscape 4.x encounters some problems ... + BrowserMatch ^Mozilla/4 gzip-only-text/html + # Netscape 4.06-4.08 encounter even more problems + BrowserMatch ^Mozilla/4\.0[678] no-gzip + # MSIE pretends it is Netscape, but all is well + BrowserMatch \bMSIE !no-gzip !gzip-only-text/html + # Do not compress images + SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary + # Ensure that proxy servers deliver the right content + Header append Vary User-Agent env=!dont-vary + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 1aae8bb..942999e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,30 +1,50 @@ -version: '3.2' +version: '3.7' services: lizmap: - image: jancelin/docker-lizmap:3.2rc6 + build: + context: . + args: + lizmap_version: 3.6.7 + LE_on: 'false' + LE_domain: 'example.com' + LE_email: 'info@example.com' + LE_staging: 'true' # change to 'false' when ready for production restart: on-failure ports: - - 80:80 - - 443:443 + - 80:80 + - 443:443 volumes: - - project:/home - - var:/var/www/websig/lizmap/var + - ./projects:/io/data:ro + - var:/var/www/lizmap/var + #- ./lizmap-previous-config/:/var/www/lizmap/previous-config depends_on: - postgis - - qgiserver + - qgisserver - redis - links: - - qgiserver:qgiserver - - redis:redis - - qgiserver: - image: jancelin/qgis-server:2.18LTR + networks: + - net + + qgisserver: + image: "opengisch/qgis-server:3.22" + + environment: + # Improve rendering performance + QGIS_SERVER_PARALLEL_RENDERING: "true" + QGIS_SERVER_MAX_THREADS: 4 + # Limit the maximum size returned by a GetMap + QGIS_SERVER_WMS_MAX_HEIGHT: 5000 + QGIS_SERVER_WMS_MAX_WIDTH: 5000 + # needs to be defined as fcgi_param in nginx.conf + # PGSERVICEFILE: /io/.pg_service.conf restart: on-failure volumes: - - project:/home + - ./projects:/io/data:ro + # - ./conf/qgis_nginx.conf:/etc/nginx/nginx.conf expose: - 80 - + networks: + - net + redis: image: redis:alpine restart: on-failure @@ -32,25 +52,24 @@ services: - redis:/data expose: - 6379 + networks: + - net postgis: - image: kartoza/postgis:10.0-2.4 + image: kartoza/postgis:11.0-2.5 ports: - 5432:5432 expose: - 5432 - entrypoint: > - bash -c "wget -N -P / https://raw.githubusercontent.com/jancelin/docker-postgis/master/setup-database.sh && - wget -N -P /home https://github.com/jancelin/docker-postgis/raw/master/geopoppy.sql && - /docker-entrypoint.sh" environment: - ALLOW_IP_RANGE=0.0.0.0/0 - POSTGRES_USER=docker - - POSTGRES_DBNAME=geopoppy - - POSTGRES_DUMP=geopoppy.sql + - POSTGRES_DBNAME=gis volumes: - postgres:/var/lib/postgresql - + networks: + - net + pgadmin4: image: chorss/docker-pgadmin4 restart: on-failure @@ -58,31 +77,26 @@ services: - 5050:5050 volumes: - pgadmin4:/data - + networks: + - net + portainer: image: portainer/portainer restart: always ports: - - 9000:9000 + - 9000:9000 volumes: - - /var/run/docker.sock:/var/run/docker.sock - - portainer:/data - - cloud: - image: coderaiser/cloudcmd:latest-alpine - restart: always - ports: - - 8000:8000 - volumes: -# - ~:/root - - project:/mnt/fs - -volumes: - portainer: - pgadmin4: - postgres: - redis: - var: - project: - + - /var/run/docker.sock:/var/run/docker.sock + - portainer:/data + networks: + - net +networks: + net: + +volumes: + portainer: + pgadmin4: + postgres: + redis: + var: diff --git a/files/index.html b/files/index.html deleted file mode 100644 index 44be58a..0000000 --- a/files/index.html +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/files/mod_deflate.conf b/files/mod_deflate.conf deleted file mode 100644 index 06e3f94..0000000 --- a/files/mod_deflate.conf +++ /dev/null @@ -1,14 +0,0 @@ - - # Insérer le filtre - SetOutputFilter DEFLATE - # Netscape 4.x rencontre quelques problèmes... - BrowserMatch ^Mozilla/4 gzip-only-text/html - # Netscape 4.06-4.08 rencontre encore plus de problèmes - BrowserMatch ^Mozilla/4\.0[678] no-gzip - # MSIE se fait passer pour Netscape, mais tout va bien - BrowserMatch \bMSIE !no-gzip !gzip-only-text/html - # Ne pas compresser les images - SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary - # S'assurer que les serveurs mandataires délivrent le bon contenu - Header append Vary User-Agent env=!dont-vary - diff --git a/files/php.conf b/files/php.conf deleted file mode 100644 index 35076e0..0000000 --- a/files/php.conf +++ /dev/null @@ -1,12 +0,0 @@ - - AddHandler fcgid-script .php - FCGIWrapper /usr/lib/cgi-bin/php5 .php - Options ExecCGI FollowSymlinks Indexes - - - - AddHandler fcgid-script .php - FCGIWrapper /usr/lib/cgi-bin/php5 .php - Options +ExecCGI - allow from all - diff --git a/files/qgis/helloWorld.qgs b/files/qgis/helloWorld.qgs deleted file mode 100644 index a6cbd56..0000000 --- a/files/qgis/helloWorld.qgs +++ /dev/null @@ -1,1407 +0,0 @@ - - - helloWorld - - - - - - - - - - - - - - - - - - - - - - - meters - - -14039290.93485941551625729 - -6029228.09191410336643457 - 18242521.59806802868843079 - 18375855.26019070670008659 - - 0 - 1 - - - +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs - 3857 - 3857 - EPSG:3857 - WGS 84 / Pseudo Mercator - merc - WGS84 - false - - - 0 - - - - - - - - - - brouillon_ligne20180320144651423 - brouillon_poly20180320144652507 - brouillon_point20180320144652972 - var120180320154917782 - var220180320154918240 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 139124.83343025398789905 - 6289672.19573212973773479 - 1220343.3699961700476706 - 7481673.52876138966530561 - - brouillon_ligne20180320144651423 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id' srid=2154 type=LineString table="public"."brouillon_ligne" (geom) sql= - - - - brouillon_ligne - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - 145 - 2154 - EPSG:2154 - RGF93 / Lambert-93 - lcc - GRS80 - false - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - - -422981.65625 - 6248613 - 1031679.125 - 7197322.5 - - brouillon_point20180320144652972 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id' srid=2154 type=Point table="public"."brouillon_point" (geom) sql= - - - - brouillon_point - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - 145 - 2154 - EPSG:2154 - RGF93 / Lambert-93 - lcc - GRS80 - false - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - - -155618.71886400401126593 - 6281087.12174491956830025 - 766962.29568241897504777 - 6798963.46789960004389286 - - brouillon_poly20180320144652507 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id' srid=2154 type=Polygon table="public"."brouillon_poly" (geom) sql= - - - - brouillon_poly - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - 145 - 2154 - EPSG:2154 - RGF93 / Lambert-93 - lcc - GRS80 - false - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - var120180320154917782 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id' table="public"."var1" sql= - - - - var1 - - - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - WGS84 - true - - - - - - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - 0 - generatedlayout - - - - - - - - - - - - - var220180320154918240 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id' table="public"."var2" sql= - - - - var2 - - - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - WGS84 - true - - - - - - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - 0 - generatedlayout - - - - - - - - - - - - - - - - +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs - EPSG:3857 - 3857 - 1 - - - meters - m2 - - - false - - - -15509051.35302524827420712 - -6035619.76164815109223127 - 19712282.01623386517167091 - 18382246.92992475256323814 - - - - - - true - 255 - - - intellectualPropertyRights - false - julien.ancelin@inra.fr - 90 - - 8 - 8 - 8 - 8 - 8 - - - helloworld - Hello World - 0546821050 - - - - - - - - no conditions apply - - - - false - - - 8 - - EPSG:2154 - EPSG:3857 - - - 2 - - brouillon_ligne20180320144651423 - brouillon_poly20180320144652507 - brouillon_point20180320144652972 - - - disabled - disabled - disabled - - current_layer - - - 2 - 2 - 2 - - - to_vertex_and_segment - to_vertex_and_segment - to_vertex_and_segment - - off - 0 - - 0.000000 - 0.000000 - 0.000000 - - - - - - Julien ANCELIN - INRA - - - - - - - - - false - - author - - 2 - true - MU - - - 0 - 255 - 255 - 255 - 255 - 255 - 255 - - - NONE - - - - brouillon_ligne20180320144651423 - brouillon_point20180320144652972 - brouillon_poly20180320144652507 - var120180320154917782 - var220180320154918240 - - - true - false - - - diff --git a/files/qgis/helloWorld.qgs.cfg b/files/qgis/helloWorld.qgs.cfg deleted file mode 100644 index 8c9e8c3..0000000 --- a/files/qgis/helloWorld.qgs.cfg +++ /dev/null @@ -1,319 +0,0 @@ -{ - "layers": { - "brouillon_poly": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "brouillon_poly20180320144652507", - "title": "polygones", - "singleTile": "True", - "geometryType": "polygon", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - -155618.718864, - 6281087.12174, - 766962.295682, - 6798963.4679 - ], - "toggled": "True", - "crs": "EPSG:2154", - "name": "brouillon_poly", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "brouillon_point": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "brouillon_point20180320144652972", - "title": "points", - "singleTile": "True", - "geometryType": "point", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - -422981.65625, - 6248613.0, - 1031679.125, - 7197322.5 - ], - "toggled": "True", - "crs": "EPSG:2154", - "name": "brouillon_point", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "brouillon_ligne": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "brouillon_ligne20180320144651423", - "title": "lignes", - "singleTile": "True", - "geometryType": "line", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 139124.83343, - 6289672.19573, - 1220343.37, - 7481673.52876 - ], - "toggled": "True", - "crs": "EPSG:2154", - "name": "brouillon_ligne", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "var1": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "var120180320154917782", - "title": "var1", - "singleTile": "True", - "geometryType": "none", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 1.79769313486e+308, - 1.79769313486e+308, - -1.79769313486e+308, - -1.79769313486e+308 - ], - "toggled": "True", - "crs": "EPSG:4326", - "name": "var1", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "var2": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "var220180320154918240", - "title": "var2", - "singleTile": "True", - "geometryType": "none", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 1.79769313486e+308, - 1.79769313486e+308, - -1.79769313486e+308, - -1.79769313486e+308 - ], - "toggled": "True", - "crs": "EPSG:4326", - "name": "var2", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - } - }, - "attributeLayers": { - "brouillon_poly": { - "hiddenFields": "", - "hideAsChild": "False", - "hideLayer": "False", - "order": 1, - "layerId": "brouillon_poly20180320144652507", - "pivot": "False", - "primaryKey": "id" - }, - "brouillon_point": { - "hiddenFields": "", - "hideAsChild": "False", - "hideLayer": "False", - "order": 2, - "layerId": "brouillon_point20180320144652972", - "pivot": "False", - "primaryKey": "id" - }, - "brouillon_ligne": { - "hiddenFields": "", - "hideAsChild": "False", - "hideLayer": "False", - "order": 0, - "layerId": "brouillon_ligne20180320144651423", - "pivot": "False", - "primaryKey": "id" - }, - "var1": { - "hiddenFields": "", - "hideAsChild": "False", - "hideLayer": "False", - "order": 3, - "layerId": "var120180320154917782", - "pivot": "False", - "primaryKey": "id" - }, - "var2": { - "hiddenFields": "", - "hideAsChild": "False", - "hideLayer": "False", - "order": 4, - "layerId": "var220180320154918240", - "pivot": "False", - "primaryKey": "id" - } - }, - "options": { - "geolocation": "True", - "projection": { - "proj4": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs", - "ref": "EPSG:3857" - }, - "popupLocation": "dock", - "initialExtent": [ - -14039290.9349, - -7180207.26282, - 18242521.5981, - 19526834.4311 - ], - "lineTolerance": 10, - "tmAnimationFrameLength": 1000, - "measure": "True", - "osmMapnik": "True", - "startupBaselayer": "osm-stamen-toner", - "hideGroupCheckbox": "True", - "googleSatellite": "True", - "limitDataToBbox": "True", - "zoomHistory": "True", - "polygonTolerance": 5, - "osmStamenToner": "True", - "mapScales": [ - 2000, - 5000, - 10000, - 25000, - 50000, - 100000, - 250000, - 500000, - 1000000, - 100000000 - ], - "bbox": [ - -15509051.353025248, - -6035619.761648151, - 19712282.016233865, - 18382246.929924753 - ], - "hideHeader": "True", - "googleStreets": "True", - "maxScale": 100000000, - "tmTimeFrameType": "seconds", - "tmTimeFrameSize": 10, - "googleTerrain": "True", - "minScale": 2000, - "pointTolerance": 25 - }, - "editionLayers": { - "brouillon_poly": { - "acl": "", - "geometryType": "polygon", - "order": 1, - "capabilities": { - "modifyGeometry": "True", - "modifyAttribute": "True", - "createFeature": "True", - "deleteFeature": "True" - }, - "layerId": "brouillon_poly20180320144652507" - }, - "brouillon_point": { - "acl": "", - "geometryType": "point", - "order": 2, - "capabilities": { - "modifyGeometry": "True", - "modifyAttribute": "True", - "createFeature": "True", - "deleteFeature": "True" - }, - "layerId": "brouillon_point20180320144652972" - }, - "brouillon_ligne": { - "acl": "", - "geometryType": "line", - "order": 0, - "capabilities": { - "modifyGeometry": "True", - "modifyAttribute": "True", - "createFeature": "True", - "deleteFeature": "True" - }, - "layerId": "brouillon_ligne20180320144651423" - }, - "var1": { - "acl": "", - "geometryType": "none", - "order": 3, - "capabilities": { - "modifyGeometry": "True", - "modifyAttribute": "True", - "createFeature": "True", - "deleteFeature": "False" - }, - "layerId": "var120180320154917782" - }, - "var2": { - "acl": "", - "geometryType": "none", - "order": 4, - "capabilities": { - "modifyGeometry": "True", - "modifyAttribute": "True", - "createFeature": "True", - "deleteFeature": "False" - }, - "layerId": "var220180320154918240" - } - } -} \ No newline at end of file diff --git a/files/qgis/helloWorld.qgs.png b/files/qgis/helloWorld.qgs.png deleted file mode 100644 index c5711e1..0000000 Binary files a/files/qgis/helloWorld.qgs.png and /dev/null differ diff --git a/files/qgis/test.qgs b/files/qgis/test.qgs deleted file mode 100644 index 480b44d..0000000 --- a/files/qgis/test.qgs +++ /dev/null @@ -1,1788 +0,0 @@ - - - test - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - meters - - 434152.38028670288622379 - 6567490.60662522912025452 - 446014.38216976262629032 - 6577978.04176649451255798 - - 0 - 1 - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - 145 - 2154 - EPSG:2154 - RGF93 / Lambert-93 - lcc - GRS80 - false - - - 0 - - - - - - - - - - inventaire_gps20180319151749951 - br_pt20180319151749959 - analyse_messicole20180319151749966 - code_culture20180319151749975 - t_plante20180319151749982 - t_terrain20180319151749990 - operateur_utilisateur20180319151749998 - classe_quantite20180319151750007 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 434213.07018819398945197 - 6567399.50550524983555079 - 447845.13077170000178739 - 6577951.68186085019260645 - - analyse_messicole20180319151749966 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='ig_id' srid=2154 type=Point table="public"."analyse_messicole" (geom) sql= - analyse messicole - - - - analyse_messicole - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - 145 - 2154 - EPSG:2154 - RGF93 / Lambert-93 - lcc - GRS80 - false - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 20 - ig_id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - ig_id - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - 380921.21483995101880282 - 6569661.19458257965743542 - 380921.21483995101880282 - 6569661.19458257965743542 - - br_pt20180319151749959 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id_br_pt' srid=2154 type=Point table="public"."br_pt" (geom) sql= - brouillon point - - - - br_pt - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - 145 - 2154 - EPSG:2154 - RGF93 / Lambert-93 - lcc - GRS80 - false - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - id_br_pt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - id_br_pt - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - classe_quantite20180319151750007 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='cla_id' table="public"."classe_quantite" sql= - - - - classe_quantite - - - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - WGS84 - true - - - - postgres - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - COALESCE("cla_id", '<NULL>') - - - code_culture20180319151749975 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='ocs_id' table="public"."code_culture" sql= - - - - code_culture - - - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - WGS84 - true - - - - postgres - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - 434144.90625 - 6567346.5 - 447913.3125 - 6578005 - - inventaire_gps20180319151749951 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='ig_id' srid=2154 type=Point table="public"."inventaire_gps" (geom) sql= - inventaire messicole - - - - inventaire_gps - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - 145 - 2154 - EPSG:2154 - RGF93 / Lambert-93 - lcc - GRS80 - false - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - ig_id - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - ig_buffer - ig_id - gid - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - - - - - operateur_utilisateur20180319151749998 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='ope_id' table="public"."operateur_utilisateur" sql= - - - - operateur_utilisateur - - - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - WGS84 - true - - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - - - - t_plante20180319151749982 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id_plante' table="public"."t_plante" sql= - - - - t_plante - - - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - WGS84 - true - - - - postgres - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - - - - - - - - - - - - - t_terrain20180319151749990 - dbname='geopoppy' host=postgis port=5432 user='docker' password='docker' sslmode=disable key='id_terrain' table="public"."t_terrain" sql= - - - - t_terrain - - - +proj=longlat +datum=WGS84 +no_defs - 3452 - 4326 - EPSG:4326 - WGS 84 - longlat - WGS84 - true - - - - postgres - - - - - - - - - - - - - - - - - - . - - - - - - - - - - - - . - - 0 - . - - 0 - generatedlayout - - - - - - - - - - - - - - - - - +proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs - EPSG:2154 - 145 - 1 - - - meters - m2 - - - false - - - 426425.90567436936544254 - 6558041.37829950731247663 - 456633.38487184763653204 - 6584748.41999341454356909 - - - - - - true - 255 - - - None - false - julien.ancelin@inra.fr - 90 - - 8 - 8 - 8 - 8 - 8 - 8 - - - test - test - 0546821050 - - - - - - - - conditions unknown - - - - false - - - 8 - - - EPSG:2154 - EPSG:4326 - EPSG:3857 - - - 2 - - analyse_messicole20180319151749966 - br_pt20180319151749959 - inventaire_gps20180319151749951 - - - disabled - disabled - disabled - - current_layer - - - 2 - 2 - 2 - - - to_vertex_and_segment - to_vertex_and_segment - to_vertex_and_segment - - off - 0 - - 0.000000 - 0.000000 - 0.000000 - - - - - - Julien Ancelin - INRA - - - - - - - - - false - - - - 2 - true - MU - - - 0 - 255 - 255 - 255 - 255 - 255 - 255 - - - NONE - - Données test usine logiciel docker-lizmap avec db postgresql/postgis - - br_pt20180319151749959 - classe_quantite20180319151750007 - code_culture20180319151749975 - operateur_utilisateur20180319151749998 - t_plante20180319151749982 - t_terrain20180319151749990 - - - true - false - - - diff --git a/files/qgis/test.qgs.cfg b/files/qgis/test.qgs.cfg deleted file mode 100644 index ee051bf..0000000 --- a/files/qgis/test.qgs.cfg +++ /dev/null @@ -1,321 +0,0 @@ -{ - "layers": { - "analyse_messicole": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "analyse_messicole20180319151749966", - "title": "analyse messicole", - "singleTile": "True", - "geometryType": "point", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 434213.070188, - 6567399.50551, - 447845.130772, - 6577951.68186 - ], - "toggled": "True", - "crs": "EPSG:2154", - "name": "analyse_messicole", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "operateur_utilisateur": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "operateur_utilisateur20180319151749998", - "title": "operateur_utilisateur", - "singleTile": "True", - "geometryType": "none", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 1.79769313486e+308, - 1.79769313486e+308, - -1.79769313486e+308, - -1.79769313486e+308 - ], - "toggled": "True", - "crs": "EPSG:4326", - "name": "operateur_utilisateur", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "t_plante": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "t_plante20180319151749982", - "title": "t_plante", - "singleTile": "True", - "geometryType": "none", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 1.79769313486e+308, - 1.79769313486e+308, - -1.79769313486e+308, - -1.79769313486e+308 - ], - "toggled": "True", - "crs": "EPSG:4326", - "name": "t_plante", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "classe_quantite": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "classe_quantite20180319151750007", - "title": "classe_quantite", - "singleTile": "True", - "geometryType": "none", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 1.79769313486e+308, - 1.79769313486e+308, - -1.79769313486e+308, - -1.79769313486e+308 - ], - "toggled": "True", - "crs": "EPSG:4326", - "name": "classe_quantite", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "t_terrain": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "t_terrain20180319151749990", - "title": "t_terrain", - "singleTile": "True", - "geometryType": "none", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 1.79769313486e+308, - 1.79769313486e+308, - -1.79769313486e+308, - -1.79769313486e+308 - ], - "toggled": "True", - "crs": "EPSG:4326", - "name": "t_terrain", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "code_culture": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "code_culture20180319151749975", - "title": "code_culture", - "singleTile": "True", - "geometryType": "none", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 1.79769313486e+308, - 1.79769313486e+308, - -1.79769313486e+308, - -1.79769313486e+308 - ], - "toggled": "True", - "crs": "EPSG:4326", - "name": "code_culture", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "br_pt": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "br_pt20180319151749959", - "title": "brouillon point", - "singleTile": "True", - "geometryType": "point", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 380921.21484, - 6569661.19458, - 380921.21484, - 6569661.19458 - ], - "toggled": "True", - "crs": "EPSG:2154", - "name": "br_pt", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - }, - "inventaire_gps": { - "abstract": "", - "displayInLegend": "True", - "baseLayer": "False", - "noLegendImage": "False", - "id": "inventaire_gps20180319151749951", - "title": "inventaire messicole", - "singleTile": "True", - "geometryType": "point", - "groupAsLayer": "False", - "popupTemplate": "", - "popup": "False", - "popupDisplayChildren": "False", - "clientCacheExpiration": 300, - "link": "", - "extent": [ - 434144.90625, - 6567346.5, - 447913.3125, - 6578005.0 - ], - "toggled": "True", - "crs": "EPSG:2154", - "name": "inventaire_gps", - "cached": "False", - "type": "layer", - "maxScale": 1000000000000, - "popupSource": "lizmap", - "imageFormat": "image/png", - "minScale": 1 - } - }, - "editionLayers": { - "br_pt": { - "acl": "", - "geometryType": "point", - "order": 0, - "capabilities": { - "modifyGeometry": "True", - "modifyAttribute": "True", - "createFeature": "True", - "deleteFeature": "True" - }, - "layerId": "br_pt20180319151749959" - }, - "inventaire_gps": { - "acl": "", - "geometryType": "point", - "order": 1, - "capabilities": { - "modifyGeometry": "True", - "modifyAttribute": "True", - "createFeature": "True", - "deleteFeature": "True" - }, - "layerId": "inventaire_gps20180319151749951" - } - }, - "options": { - "geolocation": "True", - "projection": { - "proj4": "+proj=lcc +lat_1=49 +lat_2=44 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs", - "ref": "EPSG:2154" - }, - "popupLocation": "dock", - "initialExtent": [ - 426425.90567436937, - 6558041.378299507, - 456633.38487184764, - 6584748.419993415 - ], - "lineTolerance": 10, - "tmAnimationFrameLength": 1000, - "measure": "True", - "osmMapnik": "True", - "startupBaselayer": "osm-mapnik", - "hideGroupCheckbox": "True", - "googleSatellite": "True", - "zoomHistory": "True", - "polygonTolerance": 5, - "osmStamenToner": "True", - "mapScales": [ - 5000, - 10000, - 25000, - 50000, - 100000 - ], - "bbox": [ - 426425.90567436937, - 6558041.378299507, - 456633.38487184764, - 6584748.419993415 - ], - "hideHeader": "True", - "maxScale": 100000, - "tmTimeFrameType": "seconds", - "tmTimeFrameSize": 10, - "minScale": 5000, - "pointTolerance": 25 - } -} \ No newline at end of file diff --git a/files/qgis/test.qgs.png b/files/qgis/test.qgs.png deleted file mode 100644 index f1b0d71..0000000 Binary files a/files/qgis/test.qgs.png and /dev/null differ diff --git a/files/setup.sh b/files/setup.sh deleted file mode 100755 index b80439c..0000000 --- a/files/setup.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -set -x - -mkdir /etc/apache2/ssl -/usr/sbin/make-ssl-cert /usr/share/ssl-cert/ssleay.cnf /etc/apache2/ssl/apache.pem -/usr/sbin/a2ensite default-ssl - -mv /home/files/php.conf /etc/apache2/conf-available/php.conf -mv /home/files/apache2.conf /etc/apache2/apache2.conf -rm -v /etc/apache2/mods-enabled/fcgid.conf -mv /home/files/fcgid.conf /etc/apache2/mods-enabled/fcgid.conf -mv /home/files/mod_deflate.conf /etc/apache2/conf-available/mod_deflate.conf -mv /home/files/apache_https.conf /etc/apache2/sites-available/default-ssl.conf -mv /home/files/apache.conf /etc/apache2/sites-available/000-default.conf -mv /home/files/index.html /var/www/index.html -mv /home/files/start.sh /start.sh -chmod 0755 /start.sh - -# unzip lizmap master -unzip /var/www/$LIZMAPVERSION.zip -d /var/www/ -mv /var/www/lizmap-web-client-$LIZMAPVERSION/ /var/www/websig/ -rm /var/www/$LIZMAPVERSION.zip -# Set rights & active config -chmod +x /var/www/websig/lizmap/install/set_rights.sh -/var/www/websig/lizmap/install/set_rights.sh www-data www-data -cp /home/files/lizmapConfig.ini.php /var/www/websig/lizmap/var/config/lizmapConfig.ini.php -cp /home/files/localconfig.ini.php /var/www/websig/lizmap/var/config/localconfig.ini.php -cp /var/www/websig/lizmap/var/config/profiles.ini.php.dist /var/www/websig/lizmap/var/config/profiles.ini.php -# Installer -php /var/www/websig/lizmap/install/installer.php -#change jauth.db -#cp /home/files/jauth.db /var/www/websig/lizmap/var/db/jauth.db -# Set rights -chown :www-data /var/www/websig/lizmap/www -R -chmod 775 /var/www/websig/lizmap/www -R -chown :www-data /var/www/websig/lizmap/var -R -chmod 775 /var/www/websig/lizmap/var -R -/var/www/websig/lizmap/install/set_rights.sh www-data www-data -cp -avr /var/www/websig/lizmap/var var/www/websig/lizmap/var_install diff --git a/files/start.sh b/files/start.sh deleted file mode 100644 index a854ae9..0000000 --- a/files/start.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -#generate config file - -VAR="/var/www/websig/lizmap/var/config" - -if [ ! -d $VAR ]; then - echo "Creating Config file in /var" - cp -avr /var/www/websig/lizmap/var_install/* /var/www/websig/lizmap/var -fi - -#set-rights - /var/www/websig/lizmap/install/set_rights.sh www-data www-data - -# Apache gets grumpy about PID files pre-existing -rm -f /var/run/apache2/apache2.pid - -exec /usr/sbin/apachectl -D FOREGROUND diff --git a/projects/data.gpkg b/projects/data.gpkg new file mode 100644 index 0000000..507c141 Binary files /dev/null and b/projects/data.gpkg differ diff --git a/projects/test.qgs b/projects/test.qgs new file mode 100644 index 0000000..dc51e78 --- /dev/null +++ b/projects/test.qgs @@ -0,0 +1,650 @@ + + + Test project + + + + + + +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs + 3857 + 3857 + EPSG:3857 + WGS 84 / Pseudo-Mercator + merc + WGS84 + false + + + + + + + + + + + + + + OpenStreetMap_6acb267c_fb1c_4aa5_9be1_d8ceb2ed360e + people_3ce4cac6_949e_4575_a88f_b6349156eabf_76ad2946_df1f_4b3c_a5e7_df35e62d3d1f + + + + + + + + + + meters + + -21039383.75992870703339577 + -21039383.75992871820926666 + 21039383.75992870703339577 + 21039383.75992870330810547 + + 0 + + + +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs + 3857 + 3857 + EPSG:3857 + WGS 84 / Pseudo-Mercator + merc + WGS84 + false + + + 0 + + + + + + + + + + + + + + + + + -20037508.34278924390673637 + -20037508.34278925508260727 + 20037508.34278924390673637 + 20037508.34278924390673637 + + OpenStreetMap_6acb267c_fb1c_4aa5_9be1_d8ceb2ed360e + crs=EPSG:3857&format&type=xyz&url=http://a.tile.openstreetmap.org/%7Bz%7D/%7Bx%7D/%7By%7D.png&zmax=19&zmin=0 + + + + OpenStreetMap + + + +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs + 3857 + 3857 + EPSG:3857 + WGS 84 / Pseudo-Mercator + merc + WGS84 + false + + + + + + + + + + + + + + + + 0 + 0 + + + + + false + + + + + wms + + + + + + + + 1 + 1 + 0 + + + + + + + + + + None + WholeRaster + Estimated + 0.02 + 0.98 + 2 + + + + + + + 0 + + + + 1009180 + 5817710 + 1031420 + 5911790 + + people_3ce4cac6_949e_4575_a88f_b6349156eabf_76ad2946_df1f_4b3c_a5e7_df35e62d3d1f + ./data.gpkg|layername=people_3ce4cac6_949e_4575_a88f_b6349156eabf + + + + people + + + +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs + 3857 + 3857 + EPSG:3857 + WGS 84 / Pseudo-Mercator + merc + WGS84 + false + + + + + + + dataset + people (offline) + + + + + + + + + + + + + + + + + 0 + 0 + + + + + false + + + + + + + + + + + + + ogr + + + + + + + + + + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + + # -*- coding: utf-8 -*- +""" +QGIS forms can have a Python function that is called when the form is +opened. + +Use this function to add extra logic to your forms. + +Enter the name of the function in the "Python Init function" +field. +An example follows: +""" +from qgis.PyQt.QtWidgets import QWidget + +def my_form_open(dialog, layer, feature): + geom = feature.geometry() + control = dialog.findChild(QWidget, "MyLineEdit") + + 0 + generatedlayout + + + + + + + + + + + + + + + + fid + + + + + + + + + + + opengis.ch + + + + + 4 + + + + + + WGS84 + + false + false + + + + + + + 5000 + None + + + + 1 + + + true + + + + false + + + + + true + 2 + MU + + + + true + 0 + 50 + false + 0 + false + 16 + false + 30 + + + + people_3ce4cac6_949e_4575_a88f_b6349156eabf_76ad2946_df1f_4b3c_a5e7_df35e62d3d1f + + + 1 + + false + + false + + 90 + + Test project + + + + + + conditions unknown + + + false + + + + 1 + false + + ./data.gpkg + + 1 + + 255 + 255 + 0 + 255 + 255 + 255 + 255 + + + m2 + meters + + + + true + + singleLayer + + 10 + /home/marco/OPENGIS.ch-CLOUD/conferences/2019/qgis_coruna/workshop_qfield_coruna_2019/workshop_3h/attendees_live.qgs + 0 + 1024 + + 1230ded733be9a709daf407bd59e2f05 + d1144f15f99bd1d57ffab0d1f70620e4 + e2a34a7ab758315678e7c348afee5ab9 + f61c6d169261b66a1cbaca4701b1efb4 + f8585dc706d79a852be17f9c9a4f9696 + + 1 + + + false + + + + 3 + + + + false + + + + + + + + + + + Test project + + + + + + + + + + + + David + 2019-03-04T11:39:10 + + + + \ No newline at end of file diff --git a/projects/test.qgs.cfg b/projects/test.qgs.cfg new file mode 100644 index 0000000..046464b --- /dev/null +++ b/projects/test.qgs.cfg @@ -0,0 +1,135 @@ +{ + "options": { + "projection": { + "proj4": "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs", + "ref": "EPSG:3857" + }, + "bbox": [ + -41788791.327147834, + -21039383.75992872, + 41788791.327147834, + 21039383.759928703 + ], + "mapScales": [ + 10000, + 25000, + 50000, + 100000, + 250000, + 500000, + 1000000, + 2500000, + 5000000, + 10000000, + 25000000, + 50000000 + ], + "minScale": 10000, + "maxScale": 50000000, + "initialExtent": [ + 597081.0943525913, + 5566630.494829406, + 1354199.0140246656, + 5940735.819843843 + ], + "popupLocation": "dock", + "pointTolerance": 25, + "lineTolerance": 10, + "polygonTolerance": 5, + "tmTimeFrameSize": 10, + "tmTimeFrameType": "seconds", + "tmAnimationFrameLength": 1000, + "startupBaselayer": "OpenStreetMap", + "datavizLocation": "dock", + "atlasLayer": "people_3ce4cac6_949e_4575_a88f_b6349156eabf_76ad2946_df1f_4b3c_a5e7_df35e62d3d1f", + "atlasDisplayLayerDescription": "True", + "atlasHighlightGeometry": "True", + "atlasZoom": "zoom", + "atlasDisplayPopup": "True", + "atlasMaxWidth": 25, + "atlasDuration": 5 + }, + "layers": { + "people": { + "id": "people_3ce4cac6_949e_4575_a88f_b6349156eabf_76ad2946_df1f_4b3c_a5e7_df35e62d3d1f", + "name": "people", + "type": "layer", + "geometryType": "point", + "extent": [ + 1009180.0, + 5817710.0, + 1031420.0, + 5911790.0 + ], + "crs": "EPSG:3857", + "title": "people", + "abstract": "", + "link": "", + "minScale": 1, + "maxScale": 1000000000000, + "toggled": "True", + "popup": "True", + "popupSource": "auto", + "popupTemplate": "", + "popupMaxFeatures": 10, + "popupDisplayChildren": "False", + "noLegendImage": "False", + "groupAsLayer": "False", + "baseLayer": "False", + "displayInLegend": "True", + "singleTile": "True", + "imageFormat": "image/png", + "cached": "False", + "clientCacheExpiration": 300 + }, + "OpenStreetMap": { + "id": "OpenStreetMap_6acb267c_fb1c_4aa5_9be1_d8ceb2ed360e", + "name": "OpenStreetMap", + "type": "layer", + "extent": [ + -20037508.342789244, + -20037508.342789255, + 20037508.342789244, + 20037508.342789244 + ], + "crs": "EPSG:3857", + "title": "OpenStreetMap", + "abstract": "", + "link": "", + "minScale": 1, + "maxScale": 1000000000000, + "toggled": "True", + "popup": "False", + "popupSource": "auto", + "popupTemplate": "", + "popupMaxFeatures": 10, + "popupDisplayChildren": "False", + "noLegendImage": "False", + "groupAsLayer": "False", + "baseLayer": "True", + "displayInLegend": "True", + "singleTile": "False", + "imageFormat": "image/png", + "cached": "False", + "clientCacheExpiration": 300, + "externalWmsToggle": "True", + "externalAccess": { + "crs": "EPSG:3857", + "format": "", + "type": "xyz", + "url": "http://a.tile.openstreetmap.org/{z}/{x}/{y}.png", + "zmax": "19", + "zmin": "0" + } + } + }, + "tooltipLayers": { + "people": { + "fields": "name", + "displayGeom": "False", + "colorGeom": "", + "layerId": "people_3ce4cac6_949e_4575_a88f_b6349156eabf_76ad2946_df1f_4b3c_a5e7_df35e62d3d1f", + "order": 0 + } + } +} \ No newline at end of file