Commit cb2184fc authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'development'

parents 114edb2f ede59f3b

.gitignore

+2 −0
Original line number Diff line number Diff line 
vendor/

data/

upload/

.idea

config/autoload/*local*

Dockerfile

+5 −5
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ RUN ln -sf /dev/stderr /var/log/apache2/error.log 
ADD docker/apache-ports.conf     ${APACHE_CONF_DIR}/ports.conf

ADD docker/apache-site.conf      ${APACHE_CONF_DIR}/sites-available/app.conf

ADD docker/apache-site-ssl.conf  ${APACHE_CONF_DIR}/sites-available/app-ssl.conf

ADD docker/fpm/pool.d/app.conf  ${PHP_CONF_DIR}/fpm/pool.d/app.conf

ADD docker/fpm/conf.d/app.ini   ${PHP_CONF_DIR}/fpm/conf.d/90-app.ini

ADD docker/fpm/pool.d/www.conf   ${PHP_CONF_DIR}/fpm/pool.d/

ADD docker/fpm/conf.d/99-app.ini ${PHP_CONF_DIR}/fpm/conf.d/



# Copie des scripts complémentaires à lancer au démarrage du container

COPY docker/entrypoint.d/* /entrypoint.d/

composer.json

+2 −1
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ 
        "unicaen/app":                  "^1.2",

        "unicaen/auth":                 "^1.2",

        "unicaen/ldap":                 "^2.2",

        "unicaen/octopus":              "^0.6.0"

        "unicaen/octopus":              "^0.6.0",

        "unicaen/db-import": "^1.1"

    },

    "require-dev": {

        "unicaen/code":                         "^1.0",

composer.lock

+963 −2198

File changed.

Preview size limit exceeded, changes collapsed.

config/application.config.php

+2 −1
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ 
$modules = [

    'ZfcBase', 'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'ZfcUserDoctrineORM',

    'BjyAuthorize', 'AssetManager',

    'UnicaenApp', 'UnicaenAuth', 'UnicaenLdap',

    'UnicaenApp', 'UnicaenAuth', 'UnicaenLdap', 'UnicaenDbImport',

    'Autoform',

    'Fichier',

    'Mailing',

    'Octopus',

    'Utilisateur',

    'Application',

    //'ZendDeveloperTools',

];



if ( 'development' == getenv('APPLICATION_ENV') ?: 'production' ) {