diff --git a/README.md b/README.md index 8a243ea..daa4f0e 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,9 @@ keeps its database in a volume. The lutece-init container will configure lutece.war by producing a modified version of the war in the .webapps directory. The modified war is only updated if the lutece.war -is newer. Then the lutece-init container will initialize the database if needed and exit. +is newer. Then the lutece-init container will initialize the database if needed and exit. +If the database needs to be initialized, you can optionally provide a `lutece.sql` database dump file +in the same directory as the `docker-compose.yml` file to populate the database tables created during this initialization. The tomcat container will deploy everything in the .webapps directory. @@ -40,7 +42,7 @@ The tomcat container will deploy everything in the .webapps directory. Login as administrator: http://localhost:8080/lutece/jsp/admin/AdminLogin.jsp Username: admin -Password: adminadmin1 +Password: adminadmin # Application Functionality Summary diff --git a/docker-compose.yml b/docker-compose.yml index 6dc7d7f..197bbf0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,7 @@ services: - ./lutece.war:/lutece.war - ./.webapps/:/webapps - ./.secrets/:/run/secrets/ + - ./lutece.sql:/lutece.sql tomcat: container_name: tomcat diff --git a/lutece-init/entrypoint.sh b/lutece-init/entrypoint.sh index 0df672d..d5c31b8 100644 --- a/lutece-init/entrypoint.sh +++ b/lutece-init/entrypoint.sh @@ -35,6 +35,12 @@ sourcewar=/lutece.war deploywar=/webapps/lutece.war extractdir=/lutece dbconfigfile=${extractdir}/WEB-INF/conf/db.properties +internalskinheaderfile=${extractdir}/WEB-INF/templates/skin/site/page_header_internal.html +homeskinheaderfile=${extractdir}/WEB-INF/templates/skin/site/page_header_home.html +internaladminheaderfile=${extractdir}/WEB-INF/templates/admin/site/page_header_internal_admin.html +homeadminheaderfile=${extractdir}/WEB-INF/templates/admin/site/page_header_home_admin.html +stockiconfile="logo-header.png" +customiconfile="francis-header-white.png" if [ ! -f ${deploywar} ] || [ ${sourcewar} -nt ${deploywar} ] then @@ -46,7 +52,12 @@ then LANG=en_US.UTF-8 rpl -q "#DB_NAME#" "${DB_NAME}" ${dbconfigfile} LANG=en_US.UTF-8 rpl -q "#DB_USER#" "${DB_USER}" ${dbconfigfile} LANG=en_US.UTF-8 rpl -q "#DB_PASS#" "${DB_PASS}" ${dbconfigfile} - LANG=en_US.UTF-8 rpl -q "#DB_HOST#" "${DB_HOST}" ${dbconfigfile} + LANG=en_US.UTF-8 rpl -q "#DB_HOST#" "${DB_HOST}" ${dbconfigfile} + + LANG=en_US.UTF-8 rpl -q "${stockiconfile}" "${customiconfile}" ${internalskinheaderfile} + LANG=en_US.UTF-8 rpl -q "${stockiconfile}" "${customiconfile}" ${homeskinheaderfile} + LANG=en_US.UTF-8 rpl -q "${stockiconfile}" "${customiconfile}" ${internaladminheaderfile} + LANG=en_US.UTF-8 rpl -q "${stockiconfile}" "${customiconfile}" ${homeadminheaderfile} cd ${extractdir} && jar cf /tmp.war * mv /tmp.war ${deploywar} @@ -80,4 +91,9 @@ else unzip -q ${deploywar} -d ${extractdir} cd ${extractdir}/WEB-INF/sql && ant + + if [ -f /lutece.sql ] + then + mysql -u ${DB_USER} -p${DB_PASS} -h ${DB_HOST} ${DB_NAME} < /lutece.sql + fi fi diff --git a/lutece-site/pom.xml b/lutece-site/pom.xml index 8747afd..8891012 100644 --- a/lutece-site/pom.xml +++ b/lutece-site/pom.xml @@ -38,5 +38,41 @@ 4.1.1 lutece-plugin + + + fr.paris.lutece.plugins + plugin-appointment + 2.0.4 + lutece-plugin + + + + fr.paris.lutece.plugins + plugin-childpages + 4.1.0 + lutece-plugin + + + + fr.paris.lutece.plugins + plugin-form + 4.1.5 + lutece-plugin + + + + fr.paris.lutece.plugins + plugin-html + 3.1.0 + lutece-plugin + + + + fr.paris.lutece.plugins + plugin-enroll + 1.0.0-SNAPSHOT + lutece-plugin + + diff --git a/lutece-site/webapp/images/feed.png b/lutece-site/webapp/images/feed.png new file mode 100644 index 0000000..315c4f4 Binary files /dev/null and b/lutece-site/webapp/images/feed.png differ diff --git a/lutece-site/webapp/images/francis-header-white.png b/lutece-site/webapp/images/francis-header-white.png new file mode 100644 index 0000000..c88c1b8 Binary files /dev/null and b/lutece-site/webapp/images/francis-header-white.png differ diff --git a/lutece-site/webapp/images/glyphicons-halflings-white.png b/lutece-site/webapp/images/glyphicons-halflings-white.png new file mode 100644 index 0000000..3bf6484 Binary files /dev/null and b/lutece-site/webapp/images/glyphicons-halflings-white.png differ diff --git a/lutece-site/webapp/images/glyphicons-halflings.png b/lutece-site/webapp/images/glyphicons-halflings.png new file mode 100644 index 0000000..a996999 Binary files /dev/null and b/lutece-site/webapp/images/glyphicons-halflings.png differ diff --git a/lutece-site/webapp/images/local/skin/bg_1.jpg b/lutece-site/webapp/images/local/skin/bg_1.jpg new file mode 100644 index 0000000..c712660 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/bg_1.jpg differ diff --git a/lutece-site/webapp/images/local/skin/carousel1.jpg b/lutece-site/webapp/images/local/skin/carousel1.jpg new file mode 100644 index 0000000..420a5ae Binary files /dev/null and b/lutece-site/webapp/images/local/skin/carousel1.jpg differ diff --git a/lutece-site/webapp/images/local/skin/carousel2.png b/lutece-site/webapp/images/local/skin/carousel2.png new file mode 100644 index 0000000..e7b45f6 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/carousel2.png differ diff --git a/lutece-site/webapp/images/local/skin/carousel3.jpg b/lutece-site/webapp/images/local/skin/carousel3.jpg new file mode 100644 index 0000000..674ed9e Binary files /dev/null and b/lutece-site/webapp/images/local/skin/carousel3.jpg differ diff --git a/lutece-site/webapp/images/local/skin/classes.jpg b/lutece-site/webapp/images/local/skin/classes.jpg new file mode 100644 index 0000000..a2c3a76 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/classes.jpg differ diff --git a/lutece-site/webapp/images/local/skin/clean.jpg b/lutece-site/webapp/images/local/skin/clean.jpg new file mode 100644 index 0000000..e8cb064 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/clean.jpg differ diff --git a/lutece-site/webapp/images/local/skin/fair.jpg b/lutece-site/webapp/images/local/skin/fair.jpg new file mode 100644 index 0000000..dfb9861 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/fair.jpg differ diff --git a/lutece-site/webapp/images/local/skin/family.jpg b/lutece-site/webapp/images/local/skin/family.jpg new file mode 100644 index 0000000..79370b9 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/family.jpg differ diff --git a/lutece-site/webapp/images/local/skin/groceries.jpg b/lutece-site/webapp/images/local/skin/groceries.jpg new file mode 100644 index 0000000..a76f04b Binary files /dev/null and b/lutece-site/webapp/images/local/skin/groceries.jpg differ diff --git a/lutece-site/webapp/images/local/skin/highschool.jpg b/lutece-site/webapp/images/local/skin/highschool.jpg new file mode 100644 index 0000000..3d55c28 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/highschool.jpg differ diff --git a/lutece-site/webapp/images/local/skin/icon_appointment.png b/lutece-site/webapp/images/local/skin/icon_appointment.png new file mode 100644 index 0000000..f3ca0d1 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/icon_appointment.png differ diff --git a/lutece-site/webapp/images/local/skin/lab.jpg b/lutece-site/webapp/images/local/skin/lab.jpg new file mode 100644 index 0000000..072f05a Binary files /dev/null and b/lutece-site/webapp/images/local/skin/lab.jpg differ diff --git a/lutece-site/webapp/images/local/skin/meditation.jpg b/lutece-site/webapp/images/local/skin/meditation.jpg new file mode 100644 index 0000000..c6ab017 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/meditation.jpg differ diff --git a/lutece-site/webapp/images/local/skin/narcotics.jpg b/lutece-site/webapp/images/local/skin/narcotics.jpg new file mode 100644 index 0000000..c8ac249 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/narcotics.jpg differ diff --git a/lutece-site/webapp/images/local/skin/nightyoga.jpg b/lutece-site/webapp/images/local/skin/nightyoga.jpg new file mode 100644 index 0000000..2078d83 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/nightyoga.jpg differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/blue.png b/lutece-site/webapp/images/local/skin/plugins/calendar/blue.png new file mode 100644 index 0000000..5118412 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/blue.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/calendar.png b/lutece-site/webapp/images/local/skin/plugins/calendar/calendar.png new file mode 100644 index 0000000..85e92bd Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/calendar.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/dots/blue.png b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/blue.png new file mode 100644 index 0000000..5118412 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/blue.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/dots/green.png b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/green.png new file mode 100644 index 0000000..b649e69 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/green.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/dots/orange.png b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/orange.png new file mode 100644 index 0000000..c46bc20 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/orange.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/dots/purple.png b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/purple.png new file mode 100644 index 0000000..b71f849 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/purple.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/dots/red.png b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/red.png new file mode 100644 index 0000000..179dc8f Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/dots/red.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/download.jpg b/lutece-site/webapp/images/local/skin/plugins/calendar/download.jpg new file mode 100644 index 0000000..cab2c58 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/download.jpg differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/event_default_picture.jpg b/lutece-site/webapp/images/local/skin/plugins/calendar/event_default_picture.jpg new file mode 100644 index 0000000..2f588ac Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/event_default_picture.jpg differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/green.png b/lutece-site/webapp/images/local/skin/plugins/calendar/green.png new file mode 100644 index 0000000..b649e69 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/green.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/mini_calendar.png b/lutece-site/webapp/images/local/skin/plugins/calendar/mini_calendar.png new file mode 100644 index 0000000..d9cd457 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/mini_calendar.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/next.png b/lutece-site/webapp/images/local/skin/plugins/calendar/next.png new file mode 100644 index 0000000..4647448 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/next.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/orange.png b/lutece-site/webapp/images/local/skin/plugins/calendar/orange.png new file mode 100644 index 0000000..c46bc20 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/orange.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/previous.png b/lutece-site/webapp/images/local/skin/plugins/calendar/previous.png new file mode 100644 index 0000000..8b6d771 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/previous.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/purple.png b/lutece-site/webapp/images/local/skin/plugins/calendar/purple.png new file mode 100644 index 0000000..b71f849 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/purple.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/red.png b/lutece-site/webapp/images/local/skin/plugins/calendar/red.png new file mode 100644 index 0000000..179dc8f Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/red.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/rights/locked.png b/lutece-site/webapp/images/local/skin/plugins/calendar/rights/locked.png new file mode 100644 index 0000000..fee9968 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/rights/locked.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/rights/write.png b/lutece-site/webapp/images/local/skin/plugins/calendar/rights/write.png new file mode 100644 index 0000000..1870b6c Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/rights/write.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/viewday.png b/lutece-site/webapp/images/local/skin/plugins/calendar/viewday.png new file mode 100644 index 0000000..3e44682 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/viewday.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/viewmonth.png b/lutece-site/webapp/images/local/skin/plugins/calendar/viewmonth.png new file mode 100644 index 0000000..b9931bb Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/viewmonth.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/calendar/viewweek.png b/lutece-site/webapp/images/local/skin/plugins/calendar/viewweek.png new file mode 100644 index 0000000..8fa1418 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/calendar/viewweek.png differ diff --git a/lutece-site/webapp/images/local/skin/plugins/form/cancel.png b/lutece-site/webapp/images/local/skin/plugins/form/cancel.png new file mode 100644 index 0000000..35682b0 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/plugins/form/cancel.png differ diff --git a/lutece-site/webapp/images/local/skin/power.jpg b/lutece-site/webapp/images/local/skin/power.jpg new file mode 100644 index 0000000..6fff57e Binary files /dev/null and b/lutece-site/webapp/images/local/skin/power.jpg differ diff --git a/lutece-site/webapp/images/local/skin/service.jpg b/lutece-site/webapp/images/local/skin/service.jpg new file mode 100644 index 0000000..84ae76e Binary files /dev/null and b/lutece-site/webapp/images/local/skin/service.jpg differ diff --git a/lutece-site/webapp/images/local/skin/stoop.jpg b/lutece-site/webapp/images/local/skin/stoop.jpg new file mode 100644 index 0000000..84e28d7 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/stoop.jpg differ diff --git a/lutece-site/webapp/images/local/skin/workers.jpg b/lutece-site/webapp/images/local/skin/workers.jpg new file mode 100644 index 0000000..22b2118 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/workers.jpg differ diff --git a/lutece-site/webapp/images/local/skin/yoga.jpg b/lutece-site/webapp/images/local/skin/yoga.jpg new file mode 100644 index 0000000..987fa02 Binary files /dev/null and b/lutece-site/webapp/images/local/skin/yoga.jpg differ diff --git a/lutece-site/webapp/images/local/skin/zumba.jpg b/lutece-site/webapp/images/local/skin/zumba.jpg new file mode 100644 index 0000000..e9f5c9a Binary files /dev/null and b/lutece-site/webapp/images/local/skin/zumba.jpg differ diff --git a/lutece-site/webapp/images/logo-header-icon.png b/lutece-site/webapp/images/logo-header-icon.png new file mode 100644 index 0000000..ca77804 Binary files /dev/null and b/lutece-site/webapp/images/logo-header-icon.png differ diff --git a/lutece-site/webapp/images/logo-header.png b/lutece-site/webapp/images/logo-header.png new file mode 100644 index 0000000..1fe1d83 Binary files /dev/null and b/lutece-site/webapp/images/logo-header.png differ diff --git a/lutece-site/webapp/images/logo.png b/lutece-site/webapp/images/logo.png new file mode 100644 index 0000000..1fe1d83 Binary files /dev/null and b/lutece-site/webapp/images/logo.png differ diff --git a/lutece-site/webapp/images/lutece_black.png b/lutece-site/webapp/images/lutece_black.png new file mode 100644 index 0000000..f41918e Binary files /dev/null and b/lutece-site/webapp/images/lutece_black.png differ diff --git a/lutece-site/webapp/images/none.jpg b/lutece-site/webapp/images/none.jpg new file mode 100644 index 0000000..aba429a Binary files /dev/null and b/lutece-site/webapp/images/none.jpg differ diff --git a/lutece-site/webapp/images/pixel.gif b/lutece-site/webapp/images/pixel.gif new file mode 100644 index 0000000..35d42e8 Binary files /dev/null and b/lutece-site/webapp/images/pixel.gif differ diff --git a/lutece-site/webapp/images/poweredby.jpg b/lutece-site/webapp/images/poweredby.jpg new file mode 100644 index 0000000..6946d85 Binary files /dev/null and b/lutece-site/webapp/images/poweredby.jpg differ diff --git a/lutece-site/webapp/images/preview.png b/lutece-site/webapp/images/preview.png new file mode 100644 index 0000000..2c12c5f Binary files /dev/null and b/lutece-site/webapp/images/preview.png differ