readme update

client update
updated data and added FullTextIndex basex db
2019-10-14 17:39:14 +02:00 · 2019-10-14 17:37:50 +02:00 · 2019-10-14 16:53:05 +02:00 · 2019-10-14 15:17:27 +02:00 · 2019-09-27 17:00:57 +02:00 · 2019-09-27 16:43:03 +02:00
12 changed files with 35 additions and 110 deletions
@@ -4,6 +4,14 @@
 echo "Creating GDP BaseX db"
 basex "db:create('gdp','/srv/basex/src/gdp.tei.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})"
 # , 'serializer': 'indent=no'
 echo "Creating FullText Index tmp file"
 basex "xslt:transform(fn:doc('/srv/basex/src/gdp.tei.xml'), fn:doc('/srv/basex/src/xslt/generateFullTextIndex.xsl'))" > /tmp/gdpFtIndex.xml
 echo "Creating FullText Index DB"
 basex "db:create('gdpFtIndex', '/tmp/gdpFtIndex.xml', (),map {'ftindex': true(),'stemming': true(),'casesens': true(),'diacritics': true(),'language': 'fr','updindex': true(),'autooptimize': true(),'maxlen': 96,'maxcats': 100,'splitsize': 0,'chop': false(),'textindex': true(),'attrindex': true(),'tokenindex': true(), 'xinclude': true()})"
 # , 'serializer': 'indent=no'
 # as we override the parent container CMD, we have to launch basexhttp here
 echo "Launching basexhttp"
@@ -1,7 +0,0 @@
 FROM nginx:latest
 COPY ./bashrc /root/.bashrc
 COPY ./inputrc /root/.inputrc
 COPY ./index.html /var/www/html/index.html
 # COPY ./default.conf /etc/nginx/conf.d/default.conf
 COPY ./default.conf /etc/nginx/nginx.conf
@@ -1,3 +0,0 @@
 PS1='\e[36m\e[1mNGINX\e[0m:\e[90m\w\e[0m\n$ '
 bind '"\e[A": history-search-backward'
 bind '"\e[B": history-search-forward'
@@ -1,49 +0,0 @@
 worker_processes 1;
 events { worker_connections 1024; }
 http {
  upstream docker-api {
      server basex:8984;
  }
  upstream docker-client {
      server client:8988;
  }
  proxy_set_header   Host $host;
  proxy_set_header   X-NginX-Proxy true;
  proxy_set_header   X-Real-IP $remote_addr;
  proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
  proxy_set_header   X-Forwarded-Host $server_name;
  server {
      listen 80;
      root /var/www/html;
      index index.html;
      charset utf-8;
      server_name dev.gdp.fr;
      access_log on;
      error_log  /var/log/nginx/error.log error;
      sendfile off;
      client_max_body_size 100m;
      location / {
          try_files $uri $uri/ index.html;
      }
      location /api {
        rewrite ^/api/(.*) /$1 break;
        proxy_redirect off;
        proxy_pass http://docker-api;
      }
      location /client {
        rewrite ^/client/(.*) /$1 break;
        proxy_redirect off;
        proxy_pass http://docker-client;
      }
  }
 }
@@ -1,13 +0,0 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
  <head>
    <meta charset="utf-8">
    <title>Proxy</title>
  </head>
  <body>
    <ul>
      <li><a href="/api">api</a></li>
      <li><a href="/client">client</a></li>
    </ul>
  </body>
 </html>
@@ -1,2 +0,0 @@
 set show-all-if-ambiguous on
 set completion-ignore-case on
@@ -10,7 +10,7 @@ sudo pacman -S docker docker-compose docker-machine
 this will clone this repos (main docker environement) and necessary other source code (synopsx, webapp, xml-tei sources, vuejs client)
 ```
-git clone --recursive -o figli https://figureslibres.io/gogs/bachir/docker-gdp.git
+git clone --recursive https://figureslibres.io/gogs/bachir/docker-gdp.git
 ```
 ## Docker
@@ -31,25 +31,39 @@ then each time you want to launch the app
 sudo docker-compose up -d
 ```
 ## DB
 <del>connect http://localhost:8984/synopsx/create-project</del>
 <del>create a 'gdp' project</del>
 <del>connect to http://localhost:8984/synopsx/config</del>
 <del>select 'gpd' and click on 'ok'</del>
 ## API
 the api is ready, you can go to http://localhost:8984/gdp/home
 ## Client
 open http://localhost:8988 in your browser
 ## Vhost or Cross Origins Policy
 Cross origin poilicy will block the api requests from client
 You'll need to install vhost domain for api and client, like dev.gdp.net and dev.api.gdp.net
 Or in firefox install this addon to allow cors addons.mozilla.org/en-US/firefox/addon/cors-everywhere/
 ## Logs
 to follow the webpack compilation process, run
 ```
 sudo docker-compose logs -f
 ```
 ## Update
 update the code
 ```
 git pull origin master
 git pull --recurse-submodules
 ```
 restart the containers
 ```
 docker-compose restart basex
 docker-compose restart client
 ```
 or rebuild if data was updated
 ```
 docker-compose up -d --build
 ```
 ## Doc
 https://github.com/guidesDeParis/webapp/blob/master/install.md
@@ -12,8 +12,6 @@ services:
      - 1984:1984
      - 8984:8984
    working_dir: "/srv/basex"
    networks:
      - api
  client:
    build: ./Docker/client
@@ -25,28 +23,7 @@ services:
    working_dir: "/app"
    depends_on:
      - basex
    networks:
      - client
  nginx:
    build: ./Docker/nginx/
    ports:
      - 8999:80
    volumes:
      - "${LOG_ROOT}:/var/log:rw"
    # working_dir: "/var/www/html"
    depends_on:
      - basex
      - client
    networks:
      - api
      - client
 volumes:
  basex-home:
  # client-home:
 networks:
  api:
  client:
Author	SHA1	Message	Date
bachir	8e441d3b5a	readme update	2019-10-14 17:39:14 +02:00
bachir	3479fb6688	client update	2019-10-14 17:37:50 +02:00
bachir	700a01a0d4	updated data and added FullTextIndex basex db	2019-10-14 16:53:05 +02:00
bachir	ed21394a25	updated wepapp submodule	2019-10-14 15:17:27 +02:00
bachir	1cf6a4ba1e	more client commits, see the client repos	2019-09-27 17:00:57 +02:00
bachir	fdf82583fe	more client commits, see the client repos	2019-09-27 16:43:03 +02:00
bachir	47ddbe61a5	more client commits, see the client repos	2019-09-27 15:22:53 +02:00
bachir	8bd97b031a	more client commits, see the client repos	2019-09-25 17:13:03 +02:00
bachir	e125aaf39b	more client commits, see the client repos	2019-09-25 16:09:58 +02:00
bachir	b4328dca7b	new commits on client	2019-09-24 17:45:20 +02:00
bachir	cabae621b7	updated readme	2019-09-18 12:13:33 +02:00
bachir	24a6ff60f7	first search results display	2019-09-18 12:07:19 +02:00
bachir	696ce52966	added CORS info in readme	2019-09-17 16:16:30 +02:00
bachir	a0324a73ef	more api review	2019-08-26 11:03:58 +02:00
bachir	2d291ac4e4	client dev fix	2019-08-21 18:48:32 +02:00
bachir	45b1d544d4	some api access fixed	2019-08-21 11:55:02 +02:00
bachir	85c13ebf5d	updated client	2019-08-20 14:39:28 +02:00
		`@@ -1,2 +0,0 @@`
			`set show-all-if-ambiguous on`
			`set completion-ignore-case on`