Merge pull request #1 from jrmartino/master

Generate Lutece site with  St Francis structure

README.md

@@ -32,15 +32,17 @@ 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. 
 
 # Use site
 
 Login as administrator: http://localhost:8080/lutece/jsp/admin/AdminLogin.jsp
 Username: admin
-Password: adminadmin1
+Password: adminadmin
 
 
 # Application Functionality Summary

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    

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

lutece-site/pom.xml

@@ -38,5 +38,41 @@
       <version>4.1.1</version>
       <type>lutece-plugin</type>
     </dependency>
+
+    <dependency>
+      <groupId>fr.paris.lutece.plugins</groupId>
+      <artifactId>plugin-appointment</artifactId>
+      <version>2.0.4</version>
+      <type>lutece-plugin</type>
+    </dependency>
+
+    <dependency>
+      <groupId>fr.paris.lutece.plugins</groupId>
+      <artifactId>plugin-childpages</artifactId>
+      <version>4.1.0</version>
+      <type>lutece-plugin</type>
+    </dependency>
+
+    <dependency>
+      <groupId>fr.paris.lutece.plugins</groupId>
+      <artifactId>plugin-form</artifactId>
+      <version>4.1.5</version>
+      <type>lutece-plugin</type>
+    </dependency>
+
+    <dependency>
+      <groupId>fr.paris.lutece.plugins</groupId>
+      <artifactId>plugin-html</artifactId>
+      <version>3.1.0</version>
+      <type>lutece-plugin</type>
+    </dependency>
+
+    <dependency>
+      <groupId>fr.paris.lutece.plugins</groupId>
+      <artifactId>plugin-enroll</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>lutece-plugin</type>
+    </dependency>
+
   </dependencies>
 </project>