Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions citelibre-participEZ/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ COPY haproxy.cfg /etc/haproxy/haproxy.cfg
RUN cd webapps && mkdir ${NAME_APP} && mv ${site}.war ${NAME_APP}/${NAME_APP}.war && cd ${NAME_APP} && jar xvf ${NAME_APP}.war && rm ${NAME_APP}.war

# Add webapps folder
COPY webapp/WEB-INF webapps/${NAME_APP}/WEB-INF/
COPY webapp/js webapps/${NAME_APP}/js/
# COPY webapp/WEB-INF webapps/${NAME_APP}/WEB-INF/
# COPY webapp/js webapps/${NAME_APP}/js/


COPY entrypoint.sh /entrypoint.sh
Expand Down
56 changes: 38 additions & 18 deletions citelibre-participEZ/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,57 @@ mail_user="${LUTECE_MAIL_USER:-}"
mail_password="${LUTECE_MAIL_PWD:-}"

# available languages to switch to in BO only
echo "Configure languages"
echo "** Configure languages"
default_fo_lang="${LUTECE_DEFAULT_LANG:-en}"
available_lang="${LUTECE_AVAILABLE_LANG:-en,fr}"
sed -i "s/lutece.i18n.defaultLocale=.*/lutece.i18n.defaultLocale=$default_fo_lang/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/lutece.properties
sed -i "s/lutece.i18n.availableLocales=.*/lutece.i18n.availableLocales=$available_lang/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/lutece.properties

echo "Config database"
echo "** Config database"
sed -i "s/portal.user=.*/portal\.user=$db_user/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/db.properties
sed -i "s/portal.password=.*/portal\.password=$db_password/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/db.properties
sed -i "s/portal.password=.*/portal\.password=$db_password/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/db.properties
sed -i "s/\/lutece/\/$db_name/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/db.properties
sed -i "s/db:3306/$db_host:$db_port/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/db.properties
sed -i "s/db:3306/$db_host:$db_port/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/db.properties

echo "** Edit host"
protocol="${PROTOCOL:-http}"
url_citelibre=${protocol}":\/\/"${URL_CITELIBRE}
url_citelibre_https="https:\/\/"${URL_CITELIBRE}
url_citelibre_html=${PROTOCOL}"%3A%2F%2F"${URL_CITELIBRE}
url_kibana=${URL_KIBANA}
url_matomo_http=${URL_MATOMO_HTTP}
url_matomo_https=${URL_MATOMO_HTTPS}
url_keycloak=${protocol}":\/\/"${URL_KEYCLOAK}

# SMTP
# Pb with new version => delete this file
rm ${tomcat}/webapps/${site_folder}/WEB-INF/conf/override/config.properties
# working on the override conf.properties file
conf_dir=${tomcat}/webapps/${site_folder}/WEB-INF/conf
conf_override_dir=${tomcat}/webapps/${site_folder}/WEB-INF/conf/override
conf_override_plugins_dir=${tomcat}/webapps/${site_folder}/WEB-INF/conf/override/plugins
template_dir=${tomcat}/webapps/${site_folder}/WEB-INF/templates/admin/system

echo "Config SMTP"
sed -i "s/mail.server=.*/mail.server=$mail_host/g" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/config.properties
sed -i "s/mail.server=.*/mail.server=$mail_host/g" ${tomcat}/webapps/${site_folder}/WEB-INF/templates/admin/system/config_properties.html
sed -i "s/http:\/\/localhost:8080/$url_citelibre/g" ${conf_override_dir}/config.properties
sed -i "s/https:\/\/localhost:8080/$url_citelibre_https/g" ${conf_override_dir}/config.properties
sed -i "s/http%3A%2F%2Flocalhost/$url_citelibre_html/g" ${conf_override_plugins_dir}/mylutece.properties
sed -i "s/http:\/\/localhost:8080/$url_citelibre/g" ${conf_override_plugins_dir}/workflow-notifygru_context.xml
sed -i "s/http%3A%2F%2Flocalhost/$url_citelibre_html/g" ${conf_override_plugins_dir}/oauth2_context.xml
sed -i "s/matomo.default.server.http.url=.*/matomo.default.server.http.url=$url_matomo_http/g" ${conf_override_plugins_dir}/matomo.properties
sed -i "s/matomo.default.server.https.url=.*/matomo.default.server.http.url=$url_matomo_https/g" ${conf_override_plugins_dir}/matomo.properties

sed -i "s/mail.server.port=.*/mail.server.port=$mail_port/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/config.properties
sed -i "s/mail.server.port=.*/mail.server.port=$mail_port/" ${tomcat}/webapps/${site_folder}/WEB-INF/templates/admin/system/config_properties.html
sed -i "s/http:\/\/localhost:8081/$url_keycloak/g" ${conf_override_plugins_dir}/mylutece-oauth2_context.xml
sed -i "s/http:\/\/localhost:8081/$url_keycloak/g" ${conf_override_plugins_dir}/mylutece.properties
sed -i "s/http:\/\/localhost:8081/$url_keycloak/g" ${conf_override_plugins_dir}/oauth2_context.xml

sed -i "s/mail.username=.*/mail.username=$mail_user/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/config.properties
sed -i "s/mail.username=.*/mail.username=$mail_user/" ${tomcat}/webapps/${site_folder}/WEB-INF/templates/admin/system/config_properties.html
echo "** Config SMTP"
sed -i "s/mail.server=.*/mail.server=$mail_host/g" ${conf_override_dir}/config.properties
sed -i "s/mail.server=.*/mail.server=$mail_host/g" ${template_dir}/config_properties.html
sed -i "s/mail.server.port=.*/mail.server.port=$mail_port/" ${conf_dir}/config.properties
sed -i "s/mail.server.port=.*/mail.server.port=$mail_port/" ${template_dir}/config_properties.html
sed -i "s/mail.username=.*/mail.username=$mail_user/" ${conf_dir}/config.properties
sed -i "s/mail.username=.*/mail.username=$mail_user/" ${template_dir}/config_properties.html
sed -i "s/mail.password=.*/mail.password=$mail_password/" ${conf_dir}/config.properties
sed -i "s/mail.password=.*/mail.password=$mail_password/" ${template_dir}/config_properties.html

sed -i "s/mail.password=.*/mail.password=$mail_password/" ${tomcat}/webapps/${site_folder}/WEB-INF/conf/config.properties
sed -i "s/mail.password=.*/mail.password=$mail_password/" ${tomcat}/webapps/${site_folder}/WEB-INF/templates/admin/system/config_properties.html

echo "Launch tomcat server"
echo "** Launch tomcat server"
if [[ "$LUTECE_INTERNAL_KEYCLOAK" == "true" ]]
then
echo "Enable haproxy on 8080"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ init.webapp.prod.url=http://localhost:8080/participEZ
################################################################################
# Portal Lutece identifier

lutece.name=CiteLibre participEZ
lutece.name=CiteLibre Particip'EZ

# Override this default with a specific site code
lutece.code=http://localhost:8080/participEZ
Expand Down Expand Up @@ -44,7 +44,6 @@ lutece.statistical.include.enable=true
lutece.statistical.include.template.head=/skin/site/statistical_include_head.html
lutece.statistical.include.template=/skin/site/statistical_include.html
lutece.statistical.site.id=0
# Statistical Server
lutece.statistical.server.url=

################################################################################
Expand All @@ -56,7 +55,7 @@ plugin.param.language=fr.fr
# Mail sending parameters (ip address of the mail server)
# username and password if authentication needed - empty otherwise)
mail.server=mailpit
mail.server.port=1025
mail.server.port=25


mail.list.separator=;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<bean id="mylutece-oauth2.authDataClient" class="fr.paris.lutece.plugins.mylutece.modules.oauth2.authentication.AuthDataClient">
<property name="name" value="authData" />
<property name="dataServerUri" value="http://localhost:8081/realms/paris/protocol/openid-connect/userinfo"/>
<property name="dataServerUri" value="http://localhost:8081/realms/citelibre_frontoffice/protocol/openid-connect/userinfo"/>
<property name="tokenMethod" value="HEADER"/>
<property name="default" value="true"/>

Expand All @@ -24,4 +24,3 @@
</bean>

</beans>

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mylutece.url.login.page=servlet/plugins/oauth2/callback?data_client=authData
mylutece.url.doLogout=http://localhost:8081/realms/paris/protocol/openid-connect/logout?redirect_uri=http%3A%2F%2Flocalhost:8080%2FparticipEZ%2F
mylutece.url.doLogout=http://localhost:8081/realms/citelibre_frontoffice/protocol/openid-connect/logout?redirect_uri=http%3A%2F%2Flocalhost:8080%2FparticipEZ%2F
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

<bean id="oauth2.server" class="fr.paris.lutece.plugins.oauth2.business.AuthServerConf">
<property name="issuer" value="http://fcp.integ01.dev-oauth2.fr"/>
<property name="authorizationEndpointUri" value="http://localhost:8081/realms/paris/protocol/openid-connect/auth"/>
<property name="tokenEndpointUri" value="http://localhost:8081/realms/paris/protocol/openid-connect/token"/>
<property name="logoutEndpointUri" value="http://localhost:8081/realms/paris/protocol/openid-connect/logout?redirect_uri=http%3A%2F%2Flocalhost%3A8080%2FparticipEZ%2F"/>
<property name="authorizationEndpointUri" value="http://localhost:8081/realms/citelibre_frontoffice/protocol/openid-connect/auth"/>
<property name="tokenEndpointUri" value="http://localhost:8081/realms/citelibre_frontoffice/protocol/openid-connect/token"/>
<property name="logoutEndpointUri" value="http://localhost:8081/realms/citelibre_frontoffice/protocol/openid-connect/logout?redirect_uri=http%3A%2F%2Flocalhost%3A8080%2FparticipEZ%2F"/>
<property name="enableJwtParser" value="false"/>
</bean>

Expand All @@ -35,4 +35,3 @@
<bean id="oauth2.jwtParser" class="fr.paris.lutece.plugins.oauth2.jwt.JjwtJWTParser" />

</beans>

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# server address "decider" is the name of webapp
solr.server.address=http://solr:8983/solr/citelibre/
# daemon
solr.daemon.indexer.incremental=false
solr.daemon.indexer.incremental=true
daemon.solrindexer.interval=86400
daemon.solrindexer.onstartup=1
solr.indexer.page.enable=false
Original file line number Diff line number Diff line change
Expand Up @@ -12,76 +12,23 @@
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">

<!-- Transaction Manager -->
<bean id="workflow-notifygru.transactionManager"
class="fr.paris.lutece.portal.service.database.DAOUtilTransactionManager"
p:pluginName="workflow-notifygru" />

<!-- DAO -->
<bean id="taskNotifyGruConfigDAO"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.business.TaskNotifyGruConfigDAO" />
<bean id="NotifyGruHistoryDAO"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.business.NotifyGruHistoryDAO" />


<!-- Task -->
<bean id="workflow-notifygru.taskTypeNotifyGru"
class="fr.paris.lutece.plugins.workflowcore.business.task.TaskType"
p:key="taskNotifyGru"
p:titleI18nKey="module.workflow.notifygru.task_notify_gru_title"
p:beanName="workflow-notifygru.taskNotifyGru"
p:configBeanName="workflow-notifygru.taskNotifyGruConfig"
p:configRequired="true" p:taskForAutomaticAction="true" />

<bean id="workflow-notifygru.taskNotifyGru"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.service.TaskNotifyGru"
scope="prototype" />
<bean id="workflow-notifygru.taskNotifyGruConfig"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.business.TaskNotifyGruConfig"
scope="prototype" />
<bean id="workflow-notifygru.notifyDirectoryTaskComponent"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.web.NotifyGruTaskComponent"
p:taskType-ref="workflow-notifygru.taskTypeNotifyGru"
p:taskConfigService-ref="workflow-notifygru.taskNotifyGruConfigService" />

<!-- Service -->
<bean id="workflow-notifygru.notifyGruService"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.service.NotifyGruService" />
<bean id="workflow-notifygru.notifyGruHistoryService"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.service.NotifyGruHistoryService" />
<bean id="workflow-notifygru.taskNotifyGruConfigService"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.service.TaskNotifyGruConfigService"
p:taskConfigDAO-ref="taskNotifyGruConfigDAO" />

<bean id="workflow-notifygru.notifyGruCacheService"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.service.cache.NotifyGruCacheService" />

<!-- library notifyGru -->
<bean id="workflow-notifygru.lib-notifygru.apiManagerTransport"
class="fr.paris.lutece.plugins.librarynotifygru.rs.service.NotificationTransportApiManagerRest">
<property name="notificationEndPoint">
<value>http://localhost:8080/participEZ/rest/grusupply/notification</value>
</property>
<property name="apiManagerEndPoint">
<value>http://localhost:8080/participEZ/rest/api/token</value>
</property>
<property name="apiManagerCredentials">
<value>tobecompleted</value>
</property>
</bean>
<bean id="workflow-notifygru.lib-notifygru.restTransport"
class="fr.paris.lutece.plugins.librarynotifygru.rs.service.NotificationTransportRest">
<property name="notificationEndPoint">

<value>http://localhost:8080/participEZ/rest/grusupply/notification</value>

</property>
</bean>
<bean id="workflow-notifygru.lib-notifygru.notificationService"
class="fr.paris.lutece.plugins.librarynotifygru.services.NotificationService">
<constructor-arg
ref="workflow-notifygru.lib-notifygru.apiManagerTransport" />
ref="workflow-notifygru.lib-notifygru.restTransport" />
</bean>


<bean id="workflow-notifygru.commentMarkerProvider"
class="fr.paris.lutece.plugins.workflow.modules.notifygru.service.provider.impl.CommentMarkerProvider" />

</beans>

20 changes: 0 additions & 20 deletions citelibre-participEZ/webapp/WEB-INF/conf/db.properties

This file was deleted.

119 changes: 0 additions & 119 deletions citelibre-participEZ/webapp/WEB-INF/conf/override/config.properties

This file was deleted.

This file was deleted.

Loading
Loading