springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Revert "Update php.in ito increase execution time"

Browse source 
This reverts commit 36f63049a7.
This commit is contained in:
Karl Cordes 2019-07-11 16:55:11 +10:00
parent 36f63049a7
commit bcc85b6759
5 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Dockerfile
View file

@ -40,12 +40,6 @@ ENV COMMIT_SHA=${COMMIT}
EXPOSE 80 EXPOSE 80
# Update the default apache site with the config we created.
ADD conf/apache-vhost.conf /etc/apache2/sites-available/cmc-sales
ADD conf/ripmime /bin/ripmime
RUN chmod +x /bin/ripmime
# Copy site into place. # Copy site into place.
ADD . /var/www/cmc-sales ADD . /var/www/cmc-sales
RUN mkdir /var/www/cmc-sales/app/tmp RUN mkdir /var/www/cmc-sales/app/tmp
@ -53,6 +47,11 @@ RUN mkdir /var/www/cmc-sales/app/tmp/logs
RUN chmod -R 755 /var/www/cmc-sales/app/tmp RUN chmod -R 755 /var/www/cmc-sales/app/tmp
# Update the default apache site with the config we created.
ADD conf/apache-vhost.conf /etc/apache2/sites-available/cmc-sales
ADD conf/ripmime /bin/ripmime
RUN chmod +x /bin/ripmime
RUN chmod +x /var/www/cmc-sales/run_vault.sh RUN chmod +x /var/www/cmc-sales/run_vault.sh
RUN a2dissite 000-default RUN a2dissite 000-default
RUN a2ensite cmc-sales RUN a2ensite cmc-sales

2
app/config/core.php
View file

@ -41,7 +41,7 @@ error_reporting(E_ALL & ~E_STRICT & ~E_DEPRECATED);
* In production mode, flash messages redirect after a time interval. * In production mode, flash messages redirect after a time interval.
* In development mode, you need to click the flash message to continue. * In development mode, you need to click the flash message to continue.
*/ */
Configure::write('debug', 1); Configure::write('debug', 0);
Configure::write('version', '1.0.1'); Configure::write('version', '1.0.1');

48
app/config/database.php
View file

@ -2,35 +2,29 @@
//CakePHP is pretty awful. I was so foolish. //CakePHP is pretty awful. I was so foolish.
$host = $_SERVER['HTTP_HOST'];
if($host == 'localhost:8888' || $host == 'localhost' || $host == 'cmclocal') {
class DATABASE_CONFIG { class DATABASE_CONFIG {
var $default = array(
'driver' => 'mysql',
'persistent' => false,
'host' => '172.17.0.1',
'login' => 'cmc',
'password' => 'cmc',
'database' => 'cmc',
'prefix' => '',
);
} var $default = array(
'driver' => 'mysql',
'persistent' => false,
'host' => '172.17.0.1',
'login' => 'cmc',
'password' => 'xVRQI&cA?7AU=hqJ!%au',
'database' => 'cmc',
'prefix' => '',
);
} else {
class DATABASE_CONFIG { // there are no tests...
var $default = array( var $test = array(
'driver' => 'mysql', 'driver' => 'mysql',
'persistent' => false, 'persistent' => false,
'host' => '172.17.0.1', 'host' => 'localhost',
'login' => 'cmc', 'login' => 'user',
'password' => 'xVRQI&cA?7AU=hqJ!%au', 'password' => 'password',
'database' => 'cmc', 'database' => 'test_database_name',
'prefix' => '', 'prefix' => '',
); );
} }
}

2
app/controllers/documents_controller.php
View file

@ -511,7 +511,7 @@ ENDINSTRUCTIONS;
} }
if(isset($this->data['PurchaseOrder']['Job'])) { if(isset($this->data['PurchaseOrder']['Job'])) {
//Loop over the submitted Jobs and add them. Fuck CakePHP is a piece of shit. //Loop over the submitted Jobs and add them. Fuck CakePHP is a piece of shit.
//This is easier than using the fucking built in crap that doesnt work. //This is easier than using the fucking built in crap that doesnt work.
//Fuck everything about this. //Fuck everything about this.
$po_id = $this->data['PurchaseOrder']['id']; $po_id = $this->data['PurchaseOrder']['id'];

4
conf/php.ini
View file

@ -437,7 +437,7 @@ expose_php = On
; Maximum execution time of each script, in seconds ; Maximum execution time of each script, in seconds
; http://php.net/max-execution-time ; http://php.net/max-execution-time
; Note: This directive is hardcoded to 0 for the CLI SAPI ; Note: This directive is hardcoded to 0 for the CLI SAPI
max_execution_time = 300 max_execution_time = 30
; Maximum amount of time each script may spend parsing request data. It's a good ; Maximum amount of time each script may spend parsing request data. It's a good
; idea to limit this time on productions servers in order to eliminate unexpectedly ; idea to limit this time on productions servers in order to eliminate unexpectedly
@ -455,7 +455,7 @@ max_input_time = 60
; Maximum amount of memory a script may consume (128MB) ; Maximum amount of memory a script may consume (128MB)
; http://php.net/memory-limit ; http://php.net/memory-limit
memory_limit = 512M memory_limit = 256M
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Error handling and logging ; ; Error handling and logging ;