Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Migrate to v2.3 #2129

Closed
wants to merge 240 commits into from
Closed

[WIP] Migrate to v2.3 #2129

wants to merge 240 commits into from

Conversation

ger-benjamin
Copy link
Member

@ger-benjamin ger-benjamin commented Oct 16, 2018

DO NOT MERGE

I do this PR now to share the state of the migration 2.3

How to have current state of the application

DB

Luxembourg

  • Clone or checkout to this branch (upgrade_23_2n)
  • ./docker-run --home make upgrade11
  • docker-compose up

Manual tasks to do in the db

Run make fix-db

Then, you can test the application on http://localhost:8080.

How to continue:

  • Bugs in admin interface
    • Can't open wms layer tab because some wms have same id that some wmts layers. Run SELECT * FROM geov3.layer_wms wms INNER JOIN geov3.layer_wmts wmts ON wmts.id = wms.id ORDER by wmts.layer; to see theme. Remove matching wmts layer to see wms layers data.
    • external / internal layer bug, run: UPDATE geov3.layergroup SET is_internal_wms = False WHERE id=807;
  • make upgrade-db should work and launch the 4 commands upper .
  • Finish the upgrade db procedure:
  • Add luxembourg new front-end.
  • Test individually each function. Debug. (A lot of changes are done in the DB, and to use python 3, new configuration must be verified now).
  • Clean the project ! (Identify what's deprecated in the code, and removes it)
  • Retablish ldap connection (commented in geoportal/init.py for testing purpose)
  • Build again from scratch, see if there is any error.

Post 2.3 task

After that the production use c2cgeoportal 2.3, we have to add an alembic script to remove the column url of table geov3.lux_layer_internal_wms (now the url is in an ogc_server). We also have to remove the url in the model definition.

./docker-run --home make upgrade11
The upgrade is nearly done, now you should:
- Run `docker-compose up -d`.
- Test your application on 'http://localhost:8480/desktop'.
To continue, type:
./docker-run --home make upgrade12
@ger-benjamin ger-benjamin self-assigned this Oct 16, 2018
@gberaudo
Copy link
Contributor

gberaudo commented Nov 2, 2018

We should use luxembourg_geoportal_1 instead of geoportailv3_geoportal_1.
It is possible to use another port than 80 for haproxy

diff --git a/Makefile b/Makefile
index 5222093..3eecc6a 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ CONFIG_VARS += referrer
 CONFIG_VARS += excluded_themes_from_search
 APACHE_VHOST ?= luxembourg-geomapfish
 
-VISIBLE_WEB_HOST ?= localhost
+VISIBLE_WEB_HOST ?= localhost:8042
 
 NGEO_LIBS_JS_FILES += node_modules/fuse.js/src/fuse.min.js
 NGEO_LIBS_JS_FILES += node_modules/jszip/dist/jszip.min.js

Change also in docker-compose.yml geoportal->environment->VISIBLE_WEB_HOST=localhost:8042.

You must also set http in docker-compose.yml geoportal->environment->VISIBLE_WEB_PROTOCOL=http.

@gberaudo
Copy link
Contributor

gberaudo commented Nov 2, 2018

In admins, delete mobile interface.
Rename desktop interface to "main".

gberaudo and others added 27 commits April 16, 2019 07:50
# Conflicts:
#	geoportailv3/models.py
In c2cgeoportal 2.x the OGC server is a distinct object shared between layers.
This commit rewrites the theme on the client to expose a similar API as in 1.x.
- fix call to attribution function (OL change);
- look for attributions in sub layers.
@gberaudo
Copy link
Contributor

We are using a different branch so I am closing this PR.

@gberaudo gberaudo closed this Jun 28, 2019
@gberaudo gberaudo deleted the upgrade_23_2nd branch June 28, 2019 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants