Fix the geonetwork playbook so that it can correctly configure geonetwork 3.0.x.

This commit is contained in:
Andrea Dell'Amico 2017-09-25 12:52:33 +02:00
parent 12ef2f63c3
commit 359d6b3c02
2 changed files with 7 additions and 3 deletions

View File

@ -676,10 +676,10 @@ INSERT INTO HarvesterSettings (id, parentid, name, value) VALUES (1,NULL,'harve
-- === Table: Users -- === Table: Users
-- ====================================================================== -- ======================================================================
{% if geonetwork_minor_version >= 2 %} {% if geonetwork_point_version < 2 or geonetwork_minor_version < 2 %}
INSERT INTO Users (id, username, password, name, surname, profile, kind, organisation, security, authtype, isenabled) VALUES (1,'admin','46e44386069f7cf0d4f2a420b9a2383a612f316e2024b0fe84052b0b96c479a23e8a0be8b90fb8c2','admin','admin',0,'','','','', 'y');
{% else %}
INSERT INTO Users (id, username, password, name, surname, profile, kind, organisation, security, authtype, enabled) VALUES (1,'admin','46e44386069f7cf0d4f2a420b9a2383a612f316e2024b0fe84052b0b96c479a23e8a0be8b90fb8c2','admin','admin',0,'','','','', true); INSERT INTO Users (id, username, password, name, surname, profile, kind, organisation, security, authtype, enabled) VALUES (1,'admin','46e44386069f7cf0d4f2a420b9a2383a612f316e2024b0fe84052b0b96c479a23e8a0be8b90fb8c2','admin','admin',0,'','','','', true);
{% else %}
INSERT INTO Users (id, username, password, name, surname, profile, kind, organisation, security, authtype, isenabled) VALUES (1,'admin','46e44386069f7cf0d4f2a420b9a2383a612f316e2024b0fe84052b0b96c479a23e8a0be8b90fb8c2','admin','admin',0,'','','','', 'y');
{% endif %} {% endif %}
INSERT INTO Address (id, address, city, country, state, zip) VALUES (1, '', '', '', '', ''); INSERT INTO Address (id, address, city, country, state, zip) VALUES (1, '', '', '', '', '');
INSERT INTO UserAddress (userid, addressid) VALUES (1, 1); INSERT INTO UserAddress (userid, addressid) VALUES (1, 1);

View File

@ -45,5 +45,9 @@
<!--<import resource="../config-db/postgres.xml"/>--> <!--<import resource="../config-db/postgres.xml"/>-->
<!--<import resource="../config-db/sqlserver.xml"/> --> <!--<import resource="../config-db/sqlserver.xml"/> -->
<!--<import resource="../config-db/postgres-postgis.xml"/> --> <!--<import resource="../config-db/postgres-postgis.xml"/> -->
{% if geonetwork_point_version >= 2 %}
<import resource="../config-db/{{ geonetwork_db_type }}.xml"/> <import resource="../config-db/{{ geonetwork_db_type }}.xml"/>
{% else %}
<import resource="../config-db/postgres.xml"/>
{% endif %}
</beans> </beans>