Skip to content

Commit

Permalink
Merge pull request #48 from joey741019/patch-2
Browse files Browse the repository at this point in the history
Patch 2
  • Loading branch information
scline authored Aug 4, 2019
2 parents c8b6ec6 + de4c0d4 commit 4410593
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,9 @@ REPLACE INTO `%DB_NAME%`.`settings` (`name`, `value`) VALUES('poller_type', '2')
* [changelog 1.1.38 -> 1.2.0][CL1.2.0]
* Add sendmail to dockerfile via yum due to cacti 1.2.0 requirements
* Created separate changlog file for future documentation cleanup
* Update Mysql variable readme to include `max_execution_time` and `memory_limit` changes for 1.2.0

* Update PHP variable readme to include `max_execution_time` and `memory_limit` changes for 1.2.0
* Add and Hotfix the PHP variable `max_execution_time` for PHP_MAX_EXECUTION_TIME and `memory_limit` for PHP_MEMORY_LIMIT

#### 1.1.38 - 05/12/2018
* Update Cacti and Spine from 1.1.37 to 1.1.38
* [changelog 1.1.37 -> 1.1.38][CL1.1.38]
Expand Down
4 changes: 2 additions & 2 deletions start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ echo "$(date +%F_%R) [Note] Setting server timezone settings to '${TZ}'"
echo "date.timezone = ${TZ}" >> /etc/php.ini

# set custom php.ini enviorments to follow Cacti Recommendations requirment
sed -i "s/^\(memory_limit=\).*/\1 ${PHP_MEMORY_LIMIT}/" /etc/php.ini
sed -i "s/^\(max_execution_time=\).*/\1 ${PHP_MAX_EXECUTION_TIME}/" /etc/php.ini
sed -i "s/^\(memory_limit =\).*/\1 ${PHP_MEMORY_LIMIT}/" /etc/php.ini
sed -i "s/^\(max_execution_time =\).*/\1 ${PHP_MAX_EXECUTION_TIME}/" /etc/php.ini

rm /etc/localtime
ln -s /usr/share/zoneinfo/${TZ} /etc/localtime
Expand Down

0 comments on commit 4410593

Please sign in to comment.