Skip to content

Patch 2 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scline merged 2 commits into from
Aug 4, 2019
Merged

Patch 2 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa45b67
Update start.sh
joey741019 Jul 15, 2019
de4c0d4
Update README.md
joey741019 Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
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