Skip to content
Snippets Groups Projects
Commit cb2184fc authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'development'

parents 114edb2f ede59f3b
No related branches found
Tags 0.2.0
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 1930 additions and 2588 deletions
.gitignore
+ 2
− 0
View file @ cb2184fc
vendor/ vendor/
data/
upload/
.idea .idea
config/autoload/*local* config/autoload/*local*
Dockerfile
+ 5
− 5
View file @ cb2184fc
...@@ -28,8 +28,8 @@ RUN ln -sf /dev/stderr /var/log/apache2/error.log ...@@ -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-ports.conf ${APACHE_CONF_DIR}/ports.conf
ADD docker/apache-site.conf ${APACHE_CONF_DIR}/sites-available/app.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/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/pool.d/www.conf ${PHP_CONF_DIR}/fpm/pool.d/
ADD docker/fpm/conf.d/app.ini ${PHP_CONF_DIR}/fpm/conf.d/90-app.ini 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 # Copie des scripts complémentaires à lancer au démarrage du container
COPY docker/entrypoint.d/* /entrypoint.d/ COPY docker/entrypoint.d/* /entrypoint.d/
......
composer.json
+ 2
− 1
View file @ cb2184fc
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
"unicaen/app": "^1.2", "unicaen/app": "^1.2",
"unicaen/auth": "^1.2", "unicaen/auth": "^1.2",
"unicaen/ldap": "^2.2", "unicaen/ldap": "^2.2",
"unicaen/octopus": "^0.6.0" "unicaen/octopus": "^0.6.0",
"unicaen/db-import": "^1.1"
}, },
"require-dev": { "require-dev": {
"unicaen/code": "^1.0", "unicaen/code": "^1.0",
......
composer.lock
+ 963
− 2198
View file @ cb2184fc
This diff is collapsed.
config/application.config.php
+ 2
− 1
View file @ cb2184fc
...@@ -3,13 +3,14 @@ ...@@ -3,13 +3,14 @@
$modules = [ $modules = [
'ZfcBase', 'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'ZfcUserDoctrineORM', 'ZfcBase', 'DoctrineModule', 'DoctrineORMModule', 'ZfcUser', 'ZfcUserDoctrineORM',
'BjyAuthorize', 'AssetManager', 'BjyAuthorize', 'AssetManager',
'UnicaenApp', 'UnicaenAuth', 'UnicaenLdap', 'UnicaenApp', 'UnicaenAuth', 'UnicaenLdap', 'UnicaenDbImport',
'Autoform', 'Autoform',
'Fichier', 'Fichier',
'Mailing', 'Mailing',
'Octopus', 'Octopus',
'Utilisateur', 'Utilisateur',
'Application', 'Application',
//'ZendDeveloperTools',
]; ];
if ( 'development' == getenv('APPLICATION_ENV') ?: 'production' ) { if ( 'development' == getenv('APPLICATION_ENV') ?: 'production' ) {
......
config/autoload/global.php
+ 1
− 19
View file @ cb2184fc
...@@ -15,23 +15,5 @@ return [ ...@@ -15,23 +15,5 @@ return [
'cache_dir' => 'data/config/', 'cache_dir' => 'data/config/',
'check_dependencies' => ($env !== 'production'), 'check_dependencies' => ($env !== 'production'),
], ],
'doctrine' => [
'configuration' => [
'orm_default' => [
'metadata_cache' => ($env === 'production' ? 'memcached' : 'array'),
'query_cache' => ($env === 'production' ? 'memcached' : 'array'),
'result_cache' => ($env === 'production' ? 'memcached' : 'array'),
'hydration_cache' => ($env === 'production' ? 'memcached' : 'array'),
'generate_proxies' => ($env !== 'production'),
],
'orm_octopus' => [
'metadata_cache' => ($env === 'production' ? 'memcached' : 'array'),
'query_cache' => ($env === 'production' ? 'memcached' : 'array'),
'result_cache' => ($env === 'production' ? 'memcached' : 'array'),
'hydration_cache' => ($env === 'production' ? 'memcached' : 'array'),
'generate_proxies' => ($env !== 'production'),
'driver' => 'orm_octopus',
],
],
],
]; ];
config/autoload/unicaen-app.global.php
+ 2
− 2
View file @ cb2184fc
...@@ -14,8 +14,8 @@ return [ ...@@ -14,8 +14,8 @@ return [
'app_infos' => [ 'app_infos' => [
'nom' => "PrEECoG", 'nom' => "PrEECoG",
'desc' => "Gestion Prévisionnelle des effectifs, des emplois et des compétences", 'desc' => "Gestion Prévisionnelle des effectifs, des emplois et des compétences",
'version' => "0.1.2", 'version' => "0.2.0",
'date' => "07/05/2019", 'date' => "03/07/2019",
'contact' => ['mail' => "dsi.applications@unicaen.fr", /*'tel' => "01 02 03 04 05"*/], 'contact' => ['mail' => "dsi.applications@unicaen.fr", /*'tel' => "01 02 03 04 05"*/],
'mentionsLegales' => "http://www.unicaen.fr/acces-direct/mentions-legales/", 'mentionsLegales' => "http://www.unicaen.fr/acces-direct/mentions-legales/",
'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/", 'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/",
......
config/autoload/unicaen-db-import.global.php 0 → 100644
+ 266
− 0
View file @ cb2184fc
<?php
namespace Application;
use UnicaenAuth\Guard\PrivilegeController;
return [
/**
* Configuration globale du module UnicaenDbImport.
*/
'import' => [
/**
* Liste des imports.
*/
'imports' => [
// [
// 'name' => 'Import_AGENT',
/**
* Configuration de la source de données à importer :
* - 'name' : petit nom (unique) de la source
* - 'table' : nom de la table source contenant les données à importer
* - 'select' : select SQL de mise en forme des données source à importer (NB: antinomique avec 'table')
* - 'connection' : identifiant de la connexion Doctrine à la base de données source
* - 'source_code_column' : nom de la colonne dans la table/vue source contenant l'identifiant unique
* - 'columns' : liste ordonnée des noms des colonnes à prendre en compte dans la table/vue source
*/
// 'source' => [
// 'name' => 'Agents geres par la DRH',
// 'table' => 'V_AGENT',
// 'select' => 'SELECT * FROM V_AGENT',
// 'connection' => 'doctrine.connection.orm_octopus',
// 'source_code_column' => 'C_INDIVIDU',
// 'columns' => ['C_SRC_INDIVIDU', 'C_SOURCE', 'PRENOM', 'NOM_USAGE'],
// ],
/**
* Forçage éventuel du nom de la table intermédiaire utilisée lorsque source et destination
* ne partagent pas la même connexion. NB: cette table intermédiaire est créée/peuplée/supprimée
* dans la base de données destination à chaque import.
* En l'absence de ce forçage, le nom de la table intermédiaire sera celui de la table destination
* préfixé par "src_".
*/
// 'intermediate_table' => 'src_agent',
/**
* Configuration de la destination des données importées :
* - 'name' : petit nom (unique) de la destination
* - 'table' : nom de la table destination vers laquelle les données sont importées
* - 'connection' : identifiant de la connexion Doctrine à la base de données destination
* - 'source_code_column' : nom de la colonne dans la table destination contenant l'identifiant unique
* - 'columns' : liste ordonnée des noms des colonnes importées dans la table destination
* - 'columns_to_char' : format sprintf nécessaire pour mettre des colonnes au format requis (string)
*/
// 'destination' => [
// 'name' => 'Agents gérés par la DRH',
// 'table' => 'agent',
// 'connection' => 'doctrine.connection.orm_default',
// 'source_code_column' => 'c_individu',
// 'columns' => ['c_src_individu', 'c_source', 'prenom', 'nom_usage'],
// 'columns_to_char' => [
// 'debut_validite' => "TO_CHAR(%s,'YYYY-MM-DD')", // car colonne destination de type TIMESTAMP
// 'fin_validite' => "TO_CHAR(%s,'YYYY-MM-DD')", // idem
// ],
// ],
// ],
[
'name' => 'Import_AGENT',
'source' => [
'name' => 'Agents geres par la DRH',
'select' => 'SELECT * FROM V_PREECOG_AGENT',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'C_INDIVIDU',
'columns' => ['C_SRC_INDIVIDU', 'C_SOURCE', 'PRENOM', 'NOM_USAGE', 'BAP_ID', 'CORPS_ID', 'GRADE_ID'],
],
'intermediate_table' => 'src_agent',
'destination' => [
'name' => 'Agents gérés par la DRH',
'table' => 'agent',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'c_individu',
'columns' => ['c_src_individu', 'c_source', 'prenom', 'nom_usage', 'bap_id', 'corps_id', 'grade_id'],
],
],
[
'name' => 'Import_STATUT',
'source' => [
'name' => 'Statut des agents geres par la DRH',
'select' => 'SELECT * FROM V_PREECOG_STATUT',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['ID_ORIG', 'C_SOURCE', 'INDIVIDU_ID', 'STRUCTURE_ID', 'D_DEBUT', 'D_FIN', 'T_TITULAIRE', 'T_CDI', 'T_CDD', 'T_VACATAIRE', 'T_ENSEIGNANT', 'T_ADMINISTRATIF', 'T_CHERCHEUR', 'T_ETUDIANT', 'T_AUDITEUR_LIBRE', 'T_DOCTORANT', 'T_DETACHE_IN', 'T_DETACHE_OUT', 'T_DISPO', 'T_HEBERGE', 'T_EMERITE', 'T_RETRAITE'],
],
'intermediate_table' => 'src_agent_statut',
'destination' => [
'name' => 'Statut des agents geres par la DRH',
'table' => 'agent_statut',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['id_orig', 'c_source', 'individu_id', 'structure_id', 'd_debut', 'd_fin', 't_titulaire', 't_cdi', 't_cdd', 't_vacataire', 't_enseignant', 't_administratif', 't_chercheur', 't_etudiant', 't_auditeur_libre', 't_doctorant', 't_detache_in', 't_detache_out', 't_dispo', 't_heberge', 't_emerite', 't_retraite'],
'columns_to_char' => [
'd_debut' => "TO_CHAR(%s,'YYYY-MM-DD')",
'd_fin' => "TO_CHAR(%s,'YYYY-MM-DD')",
],
],
],
[
'name' => 'Import_STRUCTURE',
'source' => [
'name' => 'Agents geres par la DRH',
'select' => 'SELECT * FROM V_PREECOG_STRUCTURE',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['CODE', 'LIBELLE_COURT', 'LIBELLE_LONG', 'TYPE', 'HISTO'],
],
'intermediate_table' => 'src_structure',
'destination' => [
'name' => 'Structure stockees dans octopus',
'table' => 'structure',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['code', 'libelle_court', 'libelle_long', 'type', 'histo'],
],
],
[
'name' => 'Import_SITE',
'source' => [
'name' => 'Sites remontés de PrEECoG',
'select' => 'SELECT * FROM V_PREECOG_SITE',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['NOM', 'LIBELLE'],
],
'intermediate_table' => 'src_site',
'destination' => [
'name' => 'Sites stockes dans octopus',
'table' => 'site',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['nom', 'libelle'],
],
],
[
'name' => 'Import_BATIMENT',
'source' => [
'name' => 'Batiments remontés de PrEECoG',
'select' => 'SELECT * FROM V_PREECOG_BATIMENT',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['NOM', 'LIBELLE', 'SITE_ID'],
],
'intermediate_table' => 'src_batiment',
'destination' => [
'name' => 'Batiments stockes dans octopus',
'table' => 'batiment',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['nom', 'libelle', 'site_id'],
],
],
[
'name' => 'Import_FONCTION',
'source' => [
'name' => 'Fonctions remontées de PrEECoG',
'select' => 'SELECT * FROM V_PREECOG_FONCTION',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['PARENT_ID', 'CODE', 'NIVEAU'],
],
'intermediate_table' => 'src_fonction',
'destination' => [
'name' => 'Fonctions remontées de OCTOPUS',
'table' => 'fonction',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['parent_id', 'code', 'niveau'],
],
],
[
'name' => 'Import_FONCTION_LIBELLE',
'source' => [
'name' => 'Libellés des fonctions remontées de PrEECoG',
'select' => 'SELECT * FROM V_PREECOG_FONCTION_LIBELLE',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['FONCTION_ID', 'LIBELLE', 'GENRE', 'DEFAUT'],
],
'intermediate_table' => 'src_fonction_libelle',
'destination' => [
'name' => 'Libellés des fonctions remontées de OCTOPUS',
'table' => 'fonction_libelle',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['fonction_id', 'libelle', 'genre', 'defaut'],
],
],
[
'name' => 'Import_BAP',
'source' => [
'name' => 'BAP des agents remonté depuis OCTOPUS',
'select' => 'SELECT * FROM V_PREECOG_BAP',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['C_BAP', 'LIB_COURT', 'LIB_LONG', 'HISTO'],
],
'intermediate_table' => 'src_correspondance',
'destination' => [
'name' => 'BAP des agents remonté depuis OCTOPUS',
'table' => 'correspondance',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['c_bap', 'lib_court', 'lib_long', 'histo'],
],
],
[
'name' => 'Import_GRADE',
'source' => [
'name' => 'Grades des agents remonté depuis OCTOPUS',
'select' => 'SELECT * FROM V_PREECOG_GRADE',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['LIB_COURT', 'LIB_LONG', 'CODE', 'HISTO'],
],
'intermediate_table' => 'src_grade',
'destination' => [
'name' => 'Grades des agents remonté depuis OCTOPUS',
'table' => 'grade',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['lib_court', 'lib_long', 'code', 'histo'],
],
],
[
'name' => 'Import_CORPS',
'source' => [
'name' => 'Corps des agents remonté depuis OCTOPUS',
'select' => 'SELECT * FROM V_PREECOG_CORPS',
'connection' => 'doctrine.connection.orm_octopus',
'source_code_column' => 'ID',
'columns' => ['LIB_COURT', 'LIB_LONG', 'CODE', 'CATEGORIE', 'HISTO'],
],
'intermediate_table' => 'src_corps',
'destination' => [
'name' => 'Corps des agents remonté depuis OCTOPUS',
'table' => 'corps',
'connection' => 'doctrine.connection.orm_default',
'source_code_column' => 'id',
'columns' => ['lib_court', 'lib_long', 'code', 'categorie', 'histo'],
],
],
],
],
'bjyauthorize' => [
'guards' => [
PrivilegeController::class => [
[
'controller' => 'UnicaenDbImport\Controller\Console',
'action' => [
'runImport',
],
'roles' => [],
],
],
],
],
];
docker-compose.yml
+ 5
− 6
View file @ cb2184fc
...@@ -7,10 +7,9 @@ services: ...@@ -7,10 +7,9 @@ services:
args: args:
PHP_VERSION: 7.0 PHP_VERSION: 7.0
context: . context: .
dockerfile: Dockerfile
ports: ports:
- "8112:80" - "8000:80"
- "8111:443" - "443:443"
volumes: volumes:
- .:/app - .:/app
- /tmp:/tmp - /tmp:/tmp
......
docker/apache-site-ssl.conf
+ 1
− 1
View file @ cb2184fc
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<IfModule proxy_fcgi_module> <IfModule proxy_fcgi_module>
<FilesMatch ".+\.ph(ar|p|tml)$"> <FilesMatch ".+\.ph(ar|p|tml)$">
SetHandler "proxy:unix:/var/run/php-fpm.sock|fcgi://localhost/" SetHandler "proxy:unix:/run/php/php-fpm.sock|fcgi://localhost/"
</FilesMatch> </FilesMatch>
</IfModule> </IfModule>
......
docker/fpm/conf.d/app.ini → docker/fpm/conf.d/99-app.ini
+ 23
− 24
View file @ cb2184fc
...@@ -3,10 +3,10 @@ date.timezone = Europe/Paris ...@@ -3,10 +3,10 @@ date.timezone = Europe/Paris
short_open_tag = Off short_open_tag = Off
expose_php = Off expose_php = Off
log_errors = On
display_startup_errors = On
display_errors = On display_errors = On
display_startup_errors = On
error_reporting = E_ALL & ~E_DEPRECATED & ~E_NOTICE error_reporting = E_ALL & ~E_DEPRECATED & ~E_NOTICE
log_errors = On
max_execution_time = 120 max_execution_time = 120
...@@ -18,33 +18,32 @@ upload_max_filesize = 501M ...@@ -18,33 +18,32 @@ upload_max_filesize = 501M
post_max_size = 502M post_max_size = 502M
;opcache.error_log=/var/log/php_opcache_error.log
;opcache.enable = 0
;opcache.memory_consumption = 256
;opcache.interned_strings_buffer = 8
;opcache.max_wasted_percentage = 5
;opcache.max_accelerated_files = 16000
;; http://php.net/manual/en/opcache.configuration.php#ini.opcache.revalidate-freq
;; defaults to zend opcache checking every 180 seconds for PHP file changes
;; set to zero to check every second if you are doing alot of frequent
;; php file edits/developer work
;; opcache.revalidate_freq=0
;opcache.revalidate_freq = 180
;opcache.fast_shutdown = 0
;opcache.enable_cli = 0
;opcache.save_comments = 1
;opcache.enable_file_override = 1
;opcache.validate_timestamps = 1
;opcache.huge_code_pages = 0
xdebug.enable = 1
xdebug.remote_enable = 1 xdebug.remote_enable = 1
xdebug.remote_connect_back = 1 xdebug.remote_connect_back = 1
xdebug.profiler_enable_trigger = 1 xdebug.profiler_enable_trigger = 1
xdebug.var_display_max_children = 1024 xdebug.var_display_max_children = 1024
xdebug.var_display_max_data = -1 xdebug.var_display_max_data = -1
xdebug.max_nesting_level = 256 xdebug.max_nesting_level = 256
# Attention: trop diminuer 'max_nesting_level' peut causer une erreur 'Maximum function nesting level of x reached' # Attention: trop diminuer 'max_nesting_level' peut causer une erreur 'Maximum function nesting level of x reached'
#xdebug.collect_params = 4 #xdebug.collect_params = 4
;opcache.error_log=/var/log/php_opcache_error.log
opcache.enable = 0
opcache.memory_consumption = 256
opcache.interned_strings_buffer = 8
opcache.max_wasted_percentage = 5
opcache.max_accelerated_files = 16000
; http://php.net/manual/en/opcache.configuration.php#ini.opcache.revalidate-freq
; defaults to zend opcache checking every 180 seconds for PHP file changes
; set to zero to check every second if you are doing alot of frequent
; php file edits/developer work
; opcache.revalidate_freq=0
opcache.revalidate_freq = 180
opcache.fast_shutdown = 0
opcache.enable_cli = 0
opcache.save_comments = 1
opcache.enable_file_override = 1
opcache.validate_timestamps = 1
opcache.huge_code_pages = 0
docker/fpm/pool.d/app.conf deleted 100644 → 0
+ 0
− 24
View file @ 114edb2f
[app]
user = www-data
group = www-data
listen = /var/run/php-fpm.sock
listen.owner = www-data
listen.group = www-data
; mandatory values
; Soit:
; pm = dynamic
; pm.max_children = 5
; pm.start_servers = 2
; pm.min_spare_servers = 1
; pm.max_spare_servers = 3
; Soit:
pm = ondemand
pm.max_children = 35
pm.process_idle_timeout = 10s
pm.max_requests = 500
request_slowlog_timeout = 30
slowlog = /var/log/php-fpm.slow.log
docker/fpm/pool.d/www.conf 0 → 100644
+ 429
− 0
View file @ cb2184fc
; Start a new pool named 'www'.
; the variable $pool can be used in any directive and will be replaced by the
; pool name ('www' here)
[www]
; Per pool prefix
; It only applies on the following directives:
; - 'access.log'
; - 'slowlog'
; - 'listen' (unixsocket)
; - 'chroot'
; - 'chdir'
; - 'php_values'
; - 'php_admin_values'
; When not set, the global prefix (or /usr) applies instead.
; Note: This directive can also be relative to the global prefix.
; Default Value: none
;prefix = /path/to/pools/$pool
; Unix user/group of processes
; Note: The user is mandatory. If the group is not set, the default user's group
; will be used.
user = www-data
group = www-data
; The address on which to accept FastCGI requests.
; Valid syntaxes are:
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
; a specific port;
; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
; a specific port;
; 'port' - to listen on a TCP socket to all addresses
; (IPv6 and IPv4-mapped) on a specific port;
; '/path/to/unix/socket' - to listen on a unix socket.
; Note: This value is mandatory.
listen = /run/php/php-fpm.sock
; Set listen(2) backlog.
; Default Value: 511 (-1 on FreeBSD and OpenBSD)
;listen.backlog = 511
; Set permissions for unix socket, if one is used. In Linux, read/write
; permissions must be set in order to allow connections from a web server. Many
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
; mode is set to 0660
listen.owner = www-data
listen.group = www-data
;listen.mode = 0660
; When POSIX Access Control Lists are supported you can set them using
; these options, value is a comma separated list of user/group names.
; When set, listen.owner and listen.group are ignored
;listen.acl_users =
;listen.acl_groups =
; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
; must be separated by a comma. If this value is left blank, connections will be
; accepted from any ip address.
; Default Value: any
;listen.allowed_clients = 127.0.0.1
; Specify the nice(2) priority to apply to the pool processes (only if set)
; The value can vary from -19 (highest priority) to 20 (lower priority)
; Note: - It will only work if the FPM master process is launched as root
; - The pool processes will inherit the master process priority
; unless it specified otherwise
; Default Value: no set
; process.priority = -19
; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
; or group is differrent than the master process user. It allows to create process
; core dump and ptrace the process for the pool user.
; Default Value: no
; process.dumpable = yes
; Choose how the process manager will control the number of child processes.
; Possible Values:
; static - a fixed number (pm.max_children) of child processes;
; dynamic - the number of child processes are set dynamically based on the
; following directives. With this process management, there will be
; always at least 1 children.
; pm.max_children - the maximum number of children that can
; be alive at the same time.
; pm.start_servers - the number of children created on startup.
; pm.min_spare_servers - the minimum number of children in 'idle'
; state (waiting to process). If the number
; of 'idle' processes is less than this
; number then some children will be created.
; pm.max_spare_servers - the maximum number of children in 'idle'
; state (waiting to process). If the number
; of 'idle' processes is greater than this
; number then some children will be killed.
; ondemand - no children are created at startup. Children will be forked when
; new requests will connect. The following parameter are used:
; pm.max_children - the maximum number of children that
; can be alive at the same time.
; pm.process_idle_timeout - The number of seconds after which
; an idle process will be killed.
; Note: This value is mandatory.
pm = dynamic
; The number of child processes to be created when pm is set to 'static' and the
; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
; This value sets the limit on the number of simultaneous requests that will be
; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
; CGI. The below defaults are based on a server without much resources. Don't
; forget to tweak pm.* to fit your needs.
; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
; Note: This value is mandatory.
pm.max_children = 5
; The number of child processes created on startup.
; Note: Used only when pm is set to 'dynamic'
; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
pm.start_servers = 2
; The desired minimum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
pm.min_spare_servers = 1
; The desired maximum number of idle server processes.
; Note: Used only when pm is set to 'dynamic'
; Note: Mandatory when pm is set to 'dynamic'
pm.max_spare_servers = 3
; The number of seconds after which an idle process will be killed.
; Note: Used only when pm is set to 'ondemand'
; Default Value: 10s
;pm.process_idle_timeout = 10s;
; The number of requests each child process should execute before respawning.
; This can be useful to work around memory leaks in 3rd party libraries. For
; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
; Default Value: 0
;pm.max_requests = 500
; The URI to view the FPM status page. If this value is not set, no URI will be
; recognized as a status page. It shows the following informations:
; pool - the name of the pool;
; process manager - static, dynamic or ondemand;
; start time - the date and time FPM has started;
; start since - number of seconds since FPM has started;
; accepted conn - the number of request accepted by the pool;
; listen queue - the number of request in the queue of pending
; connections (see backlog in listen(2));
; max listen queue - the maximum number of requests in the queue
; of pending connections since FPM has started;
; listen queue len - the size of the socket queue of pending connections;
; idle processes - the number of idle processes;
; active processes - the number of active processes;
; total processes - the number of idle + active processes;
; max active processes - the maximum number of active processes since FPM
; has started;
; max children reached - number of times, the process limit has been reached,
; when pm tries to start more children (works only for
; pm 'dynamic' and 'ondemand');
; Value are updated in real time.
; Example output:
; pool: www
; process manager: static
; start time: 01/Jul/2011:17:53:49 +0200
; start since: 62636
; accepted conn: 190460
; listen queue: 0
; max listen queue: 1
; listen queue len: 42
; idle processes: 4
; active processes: 11
; total processes: 15
; max active processes: 12
; max children reached: 0
;
; By default the status page output is formatted as text/plain. Passing either
; 'html', 'xml' or 'json' in the query string will return the corresponding
; output syntax. Example:
; http://www.foo.bar/status
; http://www.foo.bar/status?json
; http://www.foo.bar/status?html
; http://www.foo.bar/status?xml
;
; By default the status page only outputs short status. Passing 'full' in the
; query string will also return status for each pool process.
; Example:
; http://www.foo.bar/status?full
; http://www.foo.bar/status?json&full
; http://www.foo.bar/status?html&full
; http://www.foo.bar/status?xml&full
; The Full status returns for each process:
; pid - the PID of the process;
; state - the state of the process (Idle, Running, ...);
; start time - the date and time the process has started;
; start since - the number of seconds since the process has started;
; requests - the number of requests the process has served;
; request duration - the duration in µs of the requests;
; request method - the request method (GET, POST, ...);
; request URI - the request URI with the query string;
; content length - the content length of the request (only with POST);
; user - the user (PHP_AUTH_USER) (or '-' if not set);
; script - the main script called (or '-' if not set);
; last request cpu - the %cpu the last request consumed
; it's always 0 if the process is not in Idle state
; because CPU calculation is done when the request
; processing has terminated;
; last request memory - the max amount of memory the last request consumed
; it's always 0 if the process is not in Idle state
; because memory calculation is done when the request
; processing has terminated;
; If the process is in Idle state, then informations are related to the
; last request the process has served. Otherwise informations are related to
; the current request being served.
; Example output:
; ************************
; pid: 31330
; state: Running
; start time: 01/Jul/2011:17:53:49 +0200
; start since: 63087
; requests: 12808
; request duration: 1250261
; request method: GET
; request URI: /test_mem.php?N=10000
; content length: 0
; user: -
; script: /home/fat/web/docs/php/test_mem.php
; last request cpu: 0.00
; last request memory: 0
;
; Note: There is a real-time FPM status monitoring sample web page available
; It's available in: /usr/share/php/7.2/fpm/status.html
;
; Note: The value must start with a leading slash (/). The value can be
; anything, but it may not be a good idea to use the .php extension or it
; may conflict with a real PHP file.
; Default Value: not set
;pm.status_path = /status
; The ping URI to call the monitoring page of FPM. If this value is not set, no
; URI will be recognized as a ping page. This could be used to test from outside
; that FPM is alive and responding, or to
; - create a graph of FPM availability (rrd or such);
; - remove a server from a group if it is not responding (load balancing);
; - trigger alerts for the operating team (24/7).
; Note: The value must start with a leading slash (/). The value can be
; anything, but it may not be a good idea to use the .php extension or it
; may conflict with a real PHP file.
; Default Value: not set
;ping.path = /ping
; This directive may be used to customize the response of a ping request. The
; response is formatted as text/plain with a 200 response code.
; Default Value: pong
;ping.response = pong
; The access log file
; Default: not set
;access.log = log/$pool.access.log
; The access log format.
; The following syntax is allowed
; %%: the '%' character
; %C: %CPU used by the request
; it can accept the following format:
; - %{user}C for user CPU only
; - %{system}C for system CPU only
; - %{total}C for user + system CPU (default)
; %d: time taken to serve the request
; it can accept the following format:
; - %{seconds}d (default)
; - %{miliseconds}d
; - %{mili}d
; - %{microseconds}d
; - %{micro}d
; %e: an environment variable (same as $_ENV or $_SERVER)
; it must be associated with embraces to specify the name of the env
; variable. Some exemples:
; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
; %f: script filename
; %l: content-length of the request (for POST request only)
; %m: request method
; %M: peak of memory allocated by PHP
; it can accept the following format:
; - %{bytes}M (default)
; - %{kilobytes}M
; - %{kilo}M
; - %{megabytes}M
; - %{mega}M
; %n: pool name
; %o: output header
; it must be associated with embraces to specify the name of the header:
; - %{Content-Type}o
; - %{X-Powered-By}o
; - %{Transfert-Encoding}o
; - ....
; %p: PID of the child that serviced the request
; %P: PID of the parent of the child that serviced the request
; %q: the query string
; %Q: the '?' character if query string exists
; %r: the request URI (without the query string, see %q and %Q)
; %R: remote IP address
; %s: status (response code)
; %t: server time the request was received
; it can accept a strftime(3) format:
; %d/%b/%Y:%H:%M:%S %z (default)
; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
; %T: time the log has been written (the request has finished)
; it can accept a strftime(3) format:
; %d/%b/%Y:%H:%M:%S %z (default)
; The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
; %u: remote user
;
; Default: "%R - %u %t \"%m %r\" %s"
;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
; The log file for slow requests
; Default Value: not set
; Note: slowlog is mandatory if request_slowlog_timeout is set
;slowlog = log/$pool.log.slow
; The timeout for serving a single request after which a PHP backtrace will be
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
; Default Value: 0
;request_slowlog_timeout = 0
; Depth of slow log stack trace.
; Default Value: 20
;request_slowlog_trace_depth = 20
; The timeout for serving a single request after which the worker process will
; be killed. This option should be used when the 'max_execution_time' ini option
; does not stop script execution for some reason. A value of '0' means 'off'.
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
; Default Value: 0
;request_terminate_timeout = 0
; Set open file descriptor rlimit.
; Default Value: system defined value
;rlimit_files = 1024
; Set max core size rlimit.
; Possible Values: 'unlimited' or an integer greater or equal to 0
; Default Value: system defined value
;rlimit_core = 0
; Chroot to this directory at the start. This value must be defined as an
; absolute path. When this value is not set, chroot is not used.
; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
; of its subdirectories. If the pool prefix is not set, the global prefix
; will be used instead.
; Note: chrooting is a great security feature and should be used whenever
; possible. However, all PHP paths will be relative to the chroot
; (error_log, sessions.save_path, ...).
; Default Value: not set
;chroot =
; Chdir to this directory at the start.
; Note: relative path can be used.
; Default Value: current directory or / when chroot
;chdir = /var/www
; Redirect worker stdout and stderr into main error log. If not set, stdout and
; stderr will be redirected to /dev/null according to FastCGI specs.
; Note: on highloaded environement, this can cause some delay in the page
; process time (several ms).
; Default Value: no
;catch_workers_output = yes
; Clear environment in FPM workers
; Prevents arbitrary environment variables from reaching FPM worker processes
; by clearing the environment in workers before env vars specified in this
; pool configuration are added.
; Setting to "no" will make all environment variables available to PHP code
; via getenv(), $_ENV and $_SERVER.
; Default Value: yes
;clear_env = no
; Limits the extensions of the main script FPM will allow to parse. This can
; prevent configuration mistakes on the web server side. You should only limit
; FPM to .php extensions to prevent malicious users to use other extensions to
; execute php code.
; Note: set an empty value to allow all extensions.
; Default Value: .php
;security.limit_extensions = .php .php3 .php4 .php5 .php7
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
; the current environment.
; Default Value: clean env
;env[HOSTNAME] = $HOSTNAME
;env[PATH] = /usr/local/bin:/usr/bin:/bin
;env[TMP] = /tmp
;env[TMPDIR] = /tmp
;env[TEMP] = /tmp
; Additional php.ini defines, specific to this pool of workers. These settings
; overwrite the values previously defined in the php.ini. The directives are the
; same as the PHP SAPI:
; php_value/php_flag - you can set classic ini defines which can
; be overwritten from PHP call 'ini_set'.
; php_admin_value/php_admin_flag - these directives won't be overwritten by
; PHP call 'ini_set'
; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
; Defining 'extension' will load the corresponding shared extension from
; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
; overwrite previously defined php.ini values, but will append the new value
; instead.
; Note: path INI options can be relative and will be expanded with the prefix
; (pool, global or /usr)
; Default Value: nothing is defined by default except the values in php.ini and
; specified at startup with the -d argument
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
;php_flag[display_errors] = off
;php_admin_value[error_log] = /var/log/fpm-php.www.log
;php_admin_flag[log_errors] = on
;php_admin_value[memory_limit] = 32M
catch_workers_output = yes
php_flag[display_errors] = on
php_admin_value[error_log] = /var/log/fpm-php.www.log
php_admin_flag[log_errors] = on
module/Application/config/merged/activite.config.php
+ 21
− 4
View file @ cb2184fc
...@@ -7,6 +7,7 @@ use Application\Controller\Activite\ActiviteControllerFactory; ...@@ -7,6 +7,7 @@ use Application\Controller\Activite\ActiviteControllerFactory;
use Application\Form\Activite\ActiviteForm; use Application\Form\Activite\ActiviteForm;
use Application\Form\Activite\ActiviteFormFactory; use Application\Form\Activite\ActiviteFormFactory;
use Application\Form\Activite\ActiviteHydrator; use Application\Form\Activite\ActiviteHydrator;
use Application\Form\Activite\ActiviteHydratorFactory;
use Application\Provider\Privilege\ActivitePrivileges; use Application\Provider\Privilege\ActivitePrivileges;
use Application\Service\Activite\ActiviteService; use Application\Service\Activite\ActiviteService;
use Application\Service\Activite\ActiviteServiceFactory; use Application\Service\Activite\ActiviteServiceFactory;
...@@ -32,15 +33,31 @@ return [ ...@@ -32,15 +33,31 @@ return [
'controller' => ActiviteController::class, 'controller' => ActiviteController::class,
'action' => [ 'action' => [
'creer', 'creer',
],
'privileges' => [
ActivitePrivileges::AJOUTER,
],
],
[
'controller' => ActiviteController::class,
'action' => [
'editer', 'editer',
'historiser', 'historiser',
'restaurer', 'restaurer',
'detruire',
], ],
'privileges' => [ 'privileges' => [
ActivitePrivileges::EDITER, ActivitePrivileges::EDITER,
], ],
], ],
[
'controller' => ActiviteController::class,
'action' => [
'detruire',
],
'privileges' => [
ActivitePrivileges::EFFACER,
],
],
], ],
], ],
], ],
...@@ -50,7 +67,7 @@ return [ ...@@ -50,7 +67,7 @@ return [
'activite' => [ 'activite' => [
'type' => Literal::class, 'type' => Literal::class,
'options' => [ 'options' => [
'route' => '/activite', 'route' => '/mission-principale',
'defaults' => [ 'defaults' => [
'controller' => ActiviteController::class, 'controller' => ActiviteController::class,
'action' => 'index', 'action' => 'index',
...@@ -141,8 +158,8 @@ return [ ...@@ -141,8 +158,8 @@ return [
], ],
], ],
'hydrators' => [ 'hydrators' => [
'invokable' => [ 'factories' => [
ActiviteHydrator::class => ActiviteHydrator::class, ActiviteHydrator::class => ActiviteHydratorFactory::class,
] ]
] ]
......
module/Application/config/merged/agent.config.php
+ 13
− 57
View file @ cb2184fc
...@@ -7,18 +7,15 @@ use Application\Controller\Agent\AgentControllerFactory; ...@@ -7,18 +7,15 @@ use Application\Controller\Agent\AgentControllerFactory;
use Application\Controller\AgentFichier\AgentFichierController; use Application\Controller\AgentFichier\AgentFichierController;
use Application\Controller\AgentFichier\AgentFichierControllerFactory; use Application\Controller\AgentFichier\AgentFichierControllerFactory;
use Application\Controller\EntretienProfessionnel\EntretienProfessionnelController; use Application\Controller\EntretienProfessionnel\EntretienProfessionnelController;
use Application\Entity\Db\AgentStatut;
use Application\Form\Agent\AgentForm; use Application\Form\Agent\AgentForm;
use Application\Form\Agent\AgentFormFactory; use Application\Form\Agent\AgentFormFactory;
use Application\Form\Agent\AgentHydrator; use Application\Form\Agent\AgentHydrator;
use Application\Form\Agent\AgentHydratorFactory; use Application\Form\Agent\AgentHydratorFactory;
use Application\Form\Agent\AgentImportForm;
use Application\Form\Agent\AgentImportFormFactory;
use Application\Provider\Privilege\AgentPrivileges; use Application\Provider\Privilege\AgentPrivileges;
use Application\Service\Agent\AgentService; use Application\Service\Agent\AgentService;
use Application\Service\Agent\AgentServiceFactory; use Application\Service\Agent\AgentServiceFactory;
use Application\View\Helper\AgentStatutViewHelper;
use Application\View\Helper\AgentViewHelper; use Application\View\Helper\AgentViewHelper;
use Application\View\Helper\AgentStatutViewHelper;
use UnicaenAuth\Guard\PrivilegeController; use UnicaenAuth\Guard\PrivilegeController;
use Zend\Mvc\Router\Http\Literal; use Zend\Mvc\Router\Http\Literal;
use Zend\Mvc\Router\Http\Segment; use Zend\Mvc\Router\Http\Segment;
...@@ -32,6 +29,7 @@ return [ ...@@ -32,6 +29,7 @@ return [
'action' => [ 'action' => [
'index', 'index',
'afficher', 'afficher',
], ],
'privileges' => [ 'privileges' => [
AgentPrivileges::AFFICHER, AgentPrivileges::AFFICHER,
...@@ -40,23 +38,12 @@ return [ ...@@ -40,23 +38,12 @@ return [
[ [
'controller' => AgentController::class, 'controller' => AgentController::class,
'action' => [ 'action' => [
'ajouter',
'importer',
'rechercher-individu', 'rechercher-individu',
], ],
'privileges' => [ 'privileges' => [
AgentPrivileges::AJOUTER, AgentPrivileges::AJOUTER,
], ],
], ],
[
'controller' => AgentController::class,
'action' => [
'supprimer',
],
'privileges' => [
AgentPrivileges::EFFACER,
],
],
[ [
'controller' => AgentController::class, 'controller' => AgentController::class,
'action' => [ 'action' => [
...@@ -102,6 +89,16 @@ return [ ...@@ -102,6 +89,16 @@ return [
], ],
'may_terminate' => true, 'may_terminate' => true,
'child_routes' => [ 'child_routes' => [
'modifier' => [
'type' => Segment::class,
'options' => [
'route' => '/modifier/:agent',
'defaults' => [
'controller' => AgentController::class,
'action' => 'modifier',
],
],
],
'fichiers' => [ 'fichiers' => [
'type' => Segment::class, 'type' => Segment::class,
'options' => [ 'options' => [
...@@ -142,46 +139,6 @@ return [ ...@@ -142,46 +139,6 @@ return [
], ],
], ],
], ],
'modifier' => [
'type' => Segment::class,
'options' => [
'route' => '/modifier/:id',
'defaults' => [
'controller' => AgentController::class,
'action' => 'modifier',
],
],
],
'supprimer' => [
'type' => Segment::class,
'options' => [
'route' => '/supprimer/:id',
'defaults' => [
'controller' => AgentController::class,
'action' => 'supprimer',
],
],
],
'ajouter' => [
'type' => Literal::class,
'options' => [
'route' => '/ajouter',
'defaults' => [
'controller' => AgentController::class,
'action' => 'ajouter',
],
],
],
'importer' => [
'type' => Literal::class,
'options' => [
'route' => '/importer',
'defaults' => [
'controller' => AgentController::class,
'action' => 'importer',
],
],
],
'rechercher-individu' => [ 'rechercher-individu' => [
'type' => Literal::class, 'type' => Literal::class,
'options' => [ 'options' => [
...@@ -213,13 +170,12 @@ return [ ...@@ -213,13 +170,12 @@ return [
'form_elements' => [ 'form_elements' => [
'factories' => [ 'factories' => [
AgentForm::class => AgentFormFactory::class, AgentForm::class => AgentFormFactory::class,
AgentImportForm::class => AgentImportFormFactory::class,
], ],
], ],
'hydrators' => [ 'hydrators' => [
'factories' => [ 'factories' => [
AgentHydrator::class => AgentHydratorFactory::class, AgentHydrator::class => AgentHydratorFactory::class,
] ],
], ],
'view_helpers' => [ 'view_helpers' => [
'invokables' => [ 'invokables' => [
......
module/Application/config/merged/fiche-metier.config.php
+ 60
− 64
View file @ cb2184fc
This diff is collapsed.
module/Application/config/merged/fiche-poste.config.php
+ 13
− 1
View file @ cb2184fc
...@@ -50,6 +50,7 @@ return [ ...@@ -50,6 +50,7 @@ return [
'retirer-fiche-metier', 'retirer-fiche-metier',
'modifier-fiche-metier', 'modifier-fiche-metier',
'selectionner-activite', 'selectionner-activite',
'export',
], ],
'roles' => [ 'roles' => [
], ],
...@@ -93,11 +94,22 @@ return [ ...@@ -93,11 +94,22 @@ return [
], ],
], ],
], ],
'export' => [
'type' => Segment::class,
'may_terminate' => true,
'options' => [
'route' => '/export/:fiche-poste',
'defaults' => [
'controller' => FichePosteController::class,
'action' => 'export',
],
],
],
'editer' => [ 'editer' => [
'type' => Segment::class, 'type' => Segment::class,
'may_terminate' => true, 'may_terminate' => true,
'options' => [ 'options' => [
'route' => '/editer/:fiche-poste', 'route' => '/editer[/:fiche-poste]',
'defaults' => [ 'defaults' => [
'controller' => FichePosteController::class, 'controller' => FichePosteController::class,
'action' => 'editer', 'action' => 'editer',
......
module/Application/config/merged/fonction.config.php deleted 100644 → 0
+ 0
− 150
View file @ 114edb2f
This diff is collapsed.
module/Application/config/merged/immobilier.config.php 0 → 100644
+ 71
− 0
View file @ cb2184fc
This diff is collapsed.
module/Application/config/merged/menu.config.php
+ 51
− 31
View file @ cb2184fc
This diff is collapsed.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment