From 2c2d31afe67fcc2a91676bcc331807b8ab96309a Mon Sep 17 00:00:00 2001 From: Michael RICOIS Date: Fri, 10 Feb 2017 11:12:01 +0100 Subject: [PATCH] Change config --- docs/CRONTAB | 11 ---- docs/README | 66 +++++++++---------- docs/VHOST | 29 -------- ...example.ini => application.cheatsheet.ini} | 0 4 files changed, 30 insertions(+), 76 deletions(-) delete mode 100644 docs/CRONTAB delete mode 100644 docs/VHOST rename docs/{application.example.ini => application.cheatsheet.ini} (100%) diff --git a/docs/CRONTAB b/docs/CRONTAB deleted file mode 100644 index 47840f5fc..000000000 --- a/docs/CRONTAB +++ /dev/null @@ -1,11 +0,0 @@ -# AltiScore -00 4 * * 1-5 www-data php /home/vhosts/extranet/current/scripts/jobs/getAltiScore.php --cron >> /home/vhosts/data/log/altiscore.log - -# Envoi commande bilan -0 * * * * root php /home/vhosts/extranet/current/scripts/jobs/bilaninput.php --send >> /home/vhosts/data/log/bilaninput.log 2>&1 - -# Suppression fichier -#0 10 01 * * root php /home/vhosts/extranet/current/scripts/jobs/bilaninput.php --delete >> /home/vhosts/data/log/bilaninput.log 2>&1 - -# Suppression fichier temporaire -01 15 06 * * root php /home/vhosts/extranet/current/scripts/jobs/removeTempFile.php --options all \ No newline at end of file diff --git a/docs/README b/docs/README index a0fb65d3a..dfa1ffb79 100644 --- a/docs/README +++ b/docs/README @@ -29,15 +29,6 @@ SYSTEM REQUIREMENTS INSTALLATION ============ -See the file scripts/build/configure.php - -On server this script is automatically called with the install option. - configure.php --install - -Each servers are reference with a directory, name as the hostname, in config dir and all configure -file is list here - - Environment configuration ------------------------- @@ -48,7 +39,10 @@ Environment configuration SetEnv APPLICATION_ENV "production" => Production SetEnv APPLICATION_ENV "staging" => Recette SetEnv APPLICATION_ENV "development" => Developpement - + + Set in apache vhost config file (mod_php) or in .user.ini (php-fpm) + + - Persistent Storage [profil.path.shared]/persit/ @@ -84,7 +78,7 @@ Environment configuration ln -vsf [profil.path.shared]/temp/pages/imgcache [profil.path.shared]/temp/pages/file/image/cache/q; ln -vsf [profil.path.shared]/persist/streetview [profil.path.shared]/temp/pages/file/streetview/img/q; ln -vsf [profil.path.shared]/persist/logos [profil.path.shared]/temp/pages/file/image/logo/q; - ln -vsf [VHOST]/publis/themes [profil.path.shared]/temp/pages/themes; + ln -vsf [VHOST]/public/themes [profil.path.shared]/temp/pages/themes; Apache configuration @@ -93,33 +87,34 @@ Apache configuration => Development example - ServerName extranet.sd.dev - AddDefaultCharset utf-8 - DocumentRoot "WORKSPACE/extranet/public" - SetEnv APPLICATION_ENV "development" - - AllowOverride All - Order allow,deny - Allow from all - - RewriteEngine On - RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR] - RewriteCond %{REQUEST_FILENAME} -s [OR] - RewriteCond %{REQUEST_FILENAME} -l [OR] - RewriteCond %{REQUEST_FILENAME} -d - RewriteRule ^.*$ - [NC,L] - RewriteRule ^.*$ index.php [NC,L] - - - # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. - LogLevel debug - ErrorLog "logs/extranet-error.log" - CustomLog "logs/extranet-access.log" common - + ServerName extranet.sd.dev + SetEnv APPLICATION_ENV "development" + AddDefaultCharset utf-8 + DirectoryIndex index.php + DocumentRoot /home/vhosts/extranet/public + + EnableSendfile Off + AllowOverride none + Require all granted + + RewriteEngine On + #RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR] + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] + + + # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. + LogLevel debug + ErrorLog ${APACHE_LOG_DIR}/extranet-error.log + CustomLog ${APACHE_LOG_DIR}/extranet-access.log combined + => Production configuration - See VHOST file + See in ansible project PHP Configuration @@ -271,4 +266,3 @@ Dans le vhosts d'apache : php_flag apc.cache_by_default On - diff --git a/docs/VHOST b/docs/VHOST deleted file mode 100644 index efd78eb29..000000000 --- a/docs/VHOST +++ /dev/null @@ -1,29 +0,0 @@ -APACHE 2.4 -========== - - - ServerName extranet.sd.dev - AddDefaultCharset utf-8 - SetEnv APPLICATION_ENV "development" - DirectoryIndex index.php - DocumentRoot /home/vhosts/extranet/public - - EnableSendfile Off - AllowOverride none - Require all granted - - RewriteEngine On - #RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR] - RewriteCond %{REQUEST_FILENAME} -s [OR] - RewriteCond %{REQUEST_FILENAME} -l [OR] - RewriteCond %{REQUEST_FILENAME} -d - RewriteRule ^.*$ - [NC,L] - RewriteRule ^.*$ index.php [NC,L] - - - # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. - LogLevel debug - ErrorLog /home/vhosts/apachelog/extranet-error.log - CustomLog /home/vhosts/apachelog/extranet-access.log combined - - diff --git a/docs/application.example.ini b/docs/application.cheatsheet.ini similarity index 100% rename from docs/application.example.ini rename to docs/application.cheatsheet.ini