lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Changed Anemometer Installation And Add Some Checks

old-stable
Mitesh Shah 11 years ago
parent
15af7b313b
commit
41c7679a93
2 changed files with 138 additions and 118 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 92
      usr/local/sbin/easyengine
  2. 164
      usr/local/sbin/eeupdate

92
usr/local/sbin/easyengine
View File

@ -497,52 +497,6 @@ PHP_PACKAGES()
touch /var/www/22222/htdocs/fpm/status/{php,debug} touch /var/www/22222/htdocs/fpm/status/{php,debug}
fi fi
# Anemometer Setup
if [ ! -d /var/www/22222/htdocs/db/anemometer/ ]
then
mkdir -p /var/www/22222/htdocs/db/anemometer/ || OwnError "Unable To Create Anemometer Directory"
# Download Anemometer
git clone https://github.com/box/Anemometer.git /var/www/22222/htdocs/db/anemometer &>> $INSTALLLOG \
|| OwnError "Unable To Clone Anemometer"
# Setup Anemometer
# Collect MySQL Login Details
MYSQLROOT
# Setup Anemometer Database
mysql -u $MYSQLUSER -p$MYSQLPASS < /var/www/22222/htdocs/db/anemometer/install.sql \
|| OwnError "Unable To Import Anemometer Database"
# Setup Anemometer Database Grants
ANEMOMETERPASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1)
mysql -u $MYSQLUSER -p$MYSQLPASS -e "grant all on slow_query_log.* to 'anemometer'@'localhost' IDENTIFIED BY '$ANEMOMETERPASS';"
# Put Data In Anemometer Database
pt-query-digest --user=anemometer --password=$ANEMOMETERPASS \
--review D=slow_query_log,t=global_query_review \
--review-history D=slow_query_log,t=global_query_review_history \
--no-report --limit=0% --filter=" \$event->{Bytes} = length(\$event->{arg}) and \$event->{hostname}=\"$HOSTNAME\"" /var/log/mysql/slow.log &>> $INSTALLLOG
# Execute On MySQL Logrotation
sed -i "/endscript/,/}/d" /etc/logrotate.d/mysql-server
echo -e " pt-query-digest --user=anemometer --password=$ANEMOMETERPASS \\" >> /etc/logrotate.d/mysql-server
echo -e " --review D=slow_query_log,t=global_query_review \\" >> /etc/logrotate.d/mysql-server
echo -e " --review-history D=slow_query_log,t=global_query_review_history \\" >> /etc/logrotate.d/mysql-server
echo -e " --no-report --limit=0% --filter=\" \\\$event->{Bytes} = length(\\\$event->{arg}) and \\\$event->{hostname}="\\\"\$HOSTNAME\\\"\" /var/log/mysql/slow.log >> /etc/logrotate.d/mysql-server
echo -e "\t\tendscript" >> /etc/logrotate.d/mysql-server
echo -e "}" >> /etc/logrotate.d/mysql-server
# Copy Anemometer Configuration File
cp /var/www/22222/htdocs/db/anemometer/conf/sample.config.inc.php /var/www/22222/htdocs/db/anemometer/conf/config.inc.php \
|| OwnError "Unable To Copy Anemometer Configuration File"
# Update Anemoneter Configuration File
sed -i "s/root/anemometer/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
sed -i "/password/ s/''/'$ANEMOMETERPASS'/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
fi
# Call PHPUSERINFO Function For PHP User Details # Call PHPUSERINFO Function For PHP User Details
PHPUSERINFO PHPUSERINFO
@ -628,6 +582,52 @@ COMMONMYSQL()
# Decrease MySQL Wait Timeout # Decrease MySQL Wait Timeout
sed -i "/#max_connections/a wait_timeout = 30 \ninteractive_timeout = 60" /etc/mysql/my.cnf sed -i "/#max_connections/a wait_timeout = 30 \ninteractive_timeout = 60" /etc/mysql/my.cnf
# Anemometer Setup
if [ ! -d /var/www/22222/htdocs/db/anemometer ]
then
mkdir -p /var/www/22222/htdocs/db/anemometer/ || OwnError "Unable To Create Anemometer Directory"
# Download Anemometer
git clone https://github.com/box/Anemometer.git /var/www/22222/htdocs/db/anemometer &>> $INSTALLLOG \
|| OwnError "Unable To Clone Anemometer"
# Setup Anemometer
# Collect MySQL Login Details
MYSQLROOT
# Setup Anemometer Database
mysql -u $MYSQLUSER -p$MYSQLPASS < /var/www/22222/htdocs/db/anemometer/install.sql \
|| OwnError "Unable To Import Anemometer Database"
# Setup Anemometer Database Grants
ANEMOMETERPASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1)
mysql -u $MYSQLUSER -p$MYSQLPASS -e "grant all on slow_query_log.* to 'anemometer'@'localhost' IDENTIFIED BY '$ANEMOMETERPASS';"
# Execute On MySQL Logrotation
sed -i "/endscript/,/}/d" /etc/logrotate.d/mysql-server
echo -e " pt-query-digest --user=anemometer --password=$ANEMOMETERPASS \\" >> /etc/logrotate.d/mysql-server
echo -e " --review D=slow_query_log,t=global_query_review \\" >> /etc/logrotate.d/mysql-server
echo -e " --review-history D=slow_query_log,t=global_query_review_history \\" >> /etc/logrotate.d/mysql-server
echo -e " --no-report --limit=0% --filter=\" \\\$event->{Bytes} = length(\\\$event->{arg}) and \\\$event->{hostname}="\\\"\$HOSTNAME\\\"\" /var/log/mysql/slow.log >> /etc/logrotate.d/mysql-server
echo -e "\t\tendscript" >> /etc/logrotate.d/mysql-server
echo -e "}" >> /etc/logrotate.d/mysql-server
# Copy Anemometer Configuration File
cp /var/www/22222/htdocs/db/anemometer/conf/sample.config.inc.php /var/www/22222/htdocs/db/anemometer/conf/config.inc.php \
|| OwnError "Unable To Copy Anemometer Configuration File"
# Update Anemoneter Configuration File
sed -i "s/root/anemometer/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
sed -i "/password/ s/''/'$ANEMOMETERPASS'/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
fi
# Call PHPUSERINFO Function For PHP User Details
PHPUSERINFO
# Change Ownership
chown -R $PHPUSER:$PHPUSER /var/www/22222/htdocs/db/anemometer/ || OwnError "Unable To Change Ownership For Anemometer"
} }
POSTFIXINSTALLTWEAKS() POSTFIXINSTALLTWEAKS()

164
usr/local/sbin/eeupdate
View File

@ -252,52 +252,6 @@ PHP_PACKAGES()
touch /var/www/22222/htdocs/fpm/status/{php,debug} touch /var/www/22222/htdocs/fpm/status/{php,debug}
fi fi
# Anemometer Setup
if [ ! -d /var/www/22222/htdocs/db/anemometer/ ]
then
mkdir -p /var/www/22222/htdocs/db/anemometer/ || OwnError "Unable To Create Anemometer Directory"
# Download Anemometer
git clone https://github.com/box/Anemometer.git /var/www/22222/htdocs/db/anemometer &>> $INSTALLLOG \
|| OwnError "Unable To Clone Anemometer"
# Setup Anemometer
# Collect MySQL Login Details
MYCNFCHECK
# Setup Anemometer Database
mysql -u $MYSQLUSER -p$MYSQLPASS < /var/www/22222/htdocs/db/anemometer/install.sql \
|| OwnError "Unable To Import Anemometer Database"
# Setup Anemometer Database Grants
ANEMOMETERPASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1)
mysql -u $MYSQLUSER -p$MYSQLPASS -e "grant all on slow_query_log.* to 'anemometer'@'localhost' IDENTIFIED BY '$ANEMOMETERPASS';"
# Put Data In Anemometer Database
pt-query-digest --user=anemometer --password=$ANEMOMETERPASS \
--review D=slow_query_log,t=global_query_review \
--review-history D=slow_query_log,t=global_query_review_history \
--no-report --limit=0% --filter=" \$event->{Bytes} = length(\$event->{arg}) and \$event->{hostname}=\"$HOSTNAME\"" /var/log/mysql/slow.log &>> $INSTALLLOG
# Execute On MySQL Logrotation
sed -i "/endscript/,/}/d" /etc/logrotate.d/mysql-server
echo -e " pt-query-digest --user=anemometer --password=$ANEMOMETERPASS \\" >> /etc/logrotate.d/mysql-server
echo -e " --review D=slow_query_log,t=global_query_review \\" >> /etc/logrotate.d/mysql-server
echo -e " --review-history D=slow_query_log,t=global_query_review_history \\" >> /etc/logrotate.d/mysql-server
echo -e " --no-report --limit=0% --filter=\" \\\$event->{Bytes} = length(\\\$event->{arg}) and \\\$event->{hostname}="\\\"\$HOSTNAME\\\"\" /var/log/mysql/slow.log >> /etc/logrotate.d/mysql-server
echo -e "\t\tendscript" >> /etc/logrotate.d/mysql-server
echo -e "}" >> /etc/logrotate.d/mysql-server
# Copy Anemometer Configuration File
cp /var/www/22222/htdocs/db/anemometer/conf/sample.config.inc.php /var/www/22222/htdocs/db/anemometer/conf/config.inc.php \
|| OwnError "Unable To Copy Anemometer Configuration File"
# Update Anemoneter Configuration File
sed -i "s/root/anemometer/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
sed -i "/password/ s/''/'$ANEMOMETERPASS'/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
fi
# Call PHPUSERINFO Function For PHP User Details # Call PHPUSERINFO Function For PHP User Details
PHPUSERINFO PHPUSERINFO
@ -305,6 +259,57 @@ PHP_PACKAGES()
chown -R $PHPUSER:$PHPUSER /var/www/22222 || OwnError "Unable To Change Ownership For /var/www/22222" chown -R $PHPUSER:$PHPUSER /var/www/22222 || OwnError "Unable To Change Ownership For /var/www/22222"
} }
ANEMOMETER_INSTALL()
{
if [ -d /etc/mysql/ ]
then
# Anemometer Setup
if [ ! -d /var/www/22222/htdocs/db/anemometer ]
then
mkdir -p /var/www/22222/htdocs/db/anemometer/ || OwnError "Unable To Create Anemometer Directory"
# Download Anemometer
git clone https://github.com/box/Anemometer.git /var/www/22222/htdocs/db/anemometer &>> $INSTALLLOG \
|| OwnError "Unable To Clone Anemometer"
# Setup Anemometer
# Collect MySQL Login Details
MYCNFCHECK
# Setup Anemometer Database
mysql -u $MYSQLUSER -p$MYSQLPASS < /var/www/22222/htdocs/db/anemometer/install.sql \
|| OwnError "Unable To Import Anemometer Database"
# Setup Anemometer Database Grants
ANEMOMETERPASS=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1)
mysql -u $MYSQLUSER -p$MYSQLPASS -e "grant all on slow_query_log.* to 'anemometer'@'localhost' IDENTIFIED BY '$ANEMOMETERPASS';"
# Execute On MySQL Logrotation
sed -i "/endscript/,/}/d" /etc/logrotate.d/mysql-server
echo -e " pt-query-digest --user=anemometer --password=$ANEMOMETERPASS \\" >> /etc/logrotate.d/mysql-server
echo -e " --review D=slow_query_log,t=global_query_review \\" >> /etc/logrotate.d/mysql-server
echo -e " --review-history D=slow_query_log,t=global_query_review_history \\" >> /etc/logrotate.d/mysql-server
echo -e " --no-report --limit=0% --filter=\" \\\$event->{Bytes} = length(\\\$event->{arg}) and \\\$event->{hostname}="\\\"\$HOSTNAME\\\"\" /var/log/mysql/slow.log >> /etc/logrotate.d/mysql-server
echo -e "\t\tendscript" >> /etc/logrotate.d/mysql-server
echo -e "}" >> /etc/logrotate.d/mysql-server
# Copy Anemometer Configuration File
cp /var/www/22222/htdocs/db/anemometer/conf/sample.config.inc.php /var/www/22222/htdocs/db/anemometer/conf/config.inc.php \
|| OwnError "Unable To Copy Anemometer Configuration File"
# Update Anemoneter Configuration File
sed -i "s/root/anemometer/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
sed -i "/password/ s/''/'$ANEMOMETERPASS'/g" /var/www/22222/htdocs/db/anemometer/conf/config.inc.php
# Call PHPUSERINFO Function For PHP User Details
PHPUSERINFO
# Change Ownership
chown -R $PHPUSER:$PHPUSER /var/www/22222/htdocs/db/anemometer/ || OwnError "Unable To Change Ownership For Anemometer"
fi
}
INSTALLPMA() INSTALLPMA()
{ {
# Install PMA/phpMyAdmin # Install PMA/phpMyAdmin
@ -346,13 +351,9 @@ INSTALLPMA()
echo -e "\033[34mAlready Installed phpMyAdmin (/var/www/22222/htdocs/db/pma)...\e[0m" echo -e "\033[34mAlready Installed phpMyAdmin (/var/www/22222/htdocs/db/pma)...\e[0m"
fi fi
} }
EE122() EE122()
{ {
# Install Packages
echo -e "\033[34mInstalling php5-xdebug percona-toolkit graphviz, Please Wait...\e[0m"
apt-get -y install php5-xdebug percona-toolkit graphviz
# EasyEngine Config File # EasyEngine Config File
sed -i "/# WordPress Defaults/i # Comma Separated Whitelist/Debugging IP Address\nip_address = \n" /etc/easyengine/ee.conf sed -i "/# WordPress Defaults/i # Comma Separated Whitelist/Debugging IP Address\nip_address = \n" /etc/easyengine/ee.conf
@ -404,33 +405,52 @@ EE122()
openssl x509 -req -days 3652 -in /var/www/22222/cert/22222.csr -signkey /var/www/22222/cert/22222.key -out /var/www/22222/cert/22222.crt &>> $INSTALLLOG \ openssl x509 -req -days 3652 -in /var/www/22222/cert/22222.csr -signkey /var/www/22222/cert/22222.key -out /var/www/22222/cert/22222.crt &>> $INSTALLLOG \
|| OwnError "Unable To Generate SSL Certificate" || OwnError "Unable To Generate SSL Certificate"
# Personal Settings For PHP # PHP Setup
echo -e "\033[34mUpdating PHP Configuration Files, Please Wait...\e[0m" dpkg -l | grep php5-fpm &>> $INSTALLLOG
if [ $? -eq 0 ]
# Needed For Custome PHP5 Logs
if [ ! -d /var/log/php5/ ]
then then
mkdir -p /var/log/php5/ || OwnError "Unable To Create PHP5 Log Directory: /var/log/php5/" # Install Packages
fi echo -e "\033[34mInstalling php5-xdebug percona-toolkit graphviz, Please Wait...\e[0m"
apt-get -y install php5-xdebug percona-toolkit graphviz
TIME_ZONE=$(cat /etc/timezone | sed "s'/'\\\/'") # Personal Settings For PHP
sed -i "s/;date.timezone.*/date.timezone = $TIME_ZONE/" /etc/php5/fpm/php.ini echo -e "\033[34mUpdating PHP Configuration Files, Please Wait...\e[0m"
# Change PHP5-FPM Error Logs Location # Needed For Custome PHP5 Logs
sed -i "s'error_log.*'error_log = /var/log/php5/fpm.log'" /etc/php5/fpm/php-fpm.conf if [ ! -d /var/log/php5/ ]
then
mkdir -p /var/log/php5/ || OwnError "Unable To Create PHP5 Log Directory: /var/log/php5/"
fi
TIME_ZONE=$(cat /etc/timezone | sed "s'/'\\\/'")
sed -i "s/;date.timezone.*/date.timezone = $TIME_ZONE/" /etc/php5/fpm/php.ini
# Change PHP5-FPM Error Logs Location
sed -i "s'error_log.*'error_log = /var/log/php5/fpm.log'" /etc/php5/fpm/php-fpm.conf
# Separate PHP POOL For Slow Logs
cp /etc/php5/fpm/pool.d/www.conf /etc/php5/fpm/pool.d/debug.conf
sed -i "s'\[www\]'[debug]'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Pool Name"
sed -i "s'listen = 127.0.0.1:9000'listen = 127.0.0.1:9001'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Fastcgi Listen Port"
sed -i "s/pm = dynamic/pm = ondemand/" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Chnage Process Manager From Dynamic To Ondemand"
sed -i "s';slowlog.*'slowlog = /var/log/php5/slow.log'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Slowlog"
sed -i "s';request_slowlog_timeout.*'request_slowlog_timeout = 10s'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Request Slowlog Timeout"
echo -e "php_admin_value[xdebug.profiler_output_dir] = /tmp/ \nphp_admin_value[xdebug.profiler_output_name] = cachegrind.out.%p-%H-%R \nphp_admin_flag[xdebug.profiler_enable_trigger] = on \nphp_admin_flag[xdebug.profiler_enable] = off" | tee -ai /etc/php5/fpm/pool.d/debug.conf &>> $INSTALLLOG \
|| OwnError "Unable To Add Xdebug Settings"
# Separate PHP POOL For Slow Logs else
cp /etc/php5/fpm/pool.d/www.conf /etc/php5/fpm/pool.d/debug.conf # Install Packages
sed -i "s'\[www\]'[debug]'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Pool Name" echo -e "\033[34mInstalling percona-toolkit graphviz, Please Wait...\e[0m"
sed -i "s'listen = 127.0.0.1:9000'listen = 127.0.0.1:9001'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Fastcgi Listen Port" apt-get -y install percona-toolkit graphviz
sed -i "s/pm = dynamic/pm = ondemand/" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Chnage Process Manager From Dynamic To Ondemand" fi
sed -i "s';slowlog.*'slowlog = /var/log/php5/slow.log'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Slowlog"
sed -i "s';request_slowlog_timeout.*'request_slowlog_timeout = 10s'" /etc/php5/fpm/pool.d/debug.conf || OwnError "Unable To Change PHP Request Slowlog Timeout"
echo -e "php_admin_value[xdebug.profiler_output_dir] = /tmp/ \nphp_admin_value[xdebug.profiler_output_name] = cachegrind.out.%p-%H-%R \nphp_admin_flag[xdebug.profiler_enable_trigger] = on \nphp_admin_flag[xdebug.profiler_enable] = off" | tee -ai /etc/php5/fpm/pool.d/debug.conf &>> $INSTALLLOG \
|| OwnError "Unable To Add Xdebug Settings"
# Install PHP Packages # Install PHP Packages
PHP_PACKAGES PHP_PACKAGES
# Install Anemometer
ANEMOMETER_INSTALL
# Install phpMyAdmin
INSTALLPMA INSTALLPMA
} }
@ -547,7 +567,7 @@ then
echo -e "\033[37msource /etc/bash_completion.d/ee\e[0m" | tee -ai $INSTALLLOG echo -e "\033[37msource /etc/bash_completion.d/ee\e[0m" | tee -ai $INSTALLLOG
echo echo
echo -e "\033[34mEasyEngine (ee) Updated Successfully\e[0m" | tee -ai $INSTALLLOG echo -e "\033[34mEasyEngine (ee) Updated Successfully\e[0m" | tee -ai $INSTALLLOG
echo -e "\033[34mPlease Ignore If You See Anything After This Line.\e[0m" | tee -ai $INSTALLLOG echo -e "\033[34mPlease Ignore If You See Anything After This Line.\e[0m" | tee -ai $INSTALLLOGfwww
echo -e "\033[34mKilling The Parent Process\e[0m" &>> $INSTALLLOG echo -e "\033[34mKilling The Parent Process\e[0m" &>> $INSTALLLOG
ps ax | grep $PPID | grep -v grep &>> $INSTALLLOG ps ax | grep $PPID | grep -v grep &>> $INSTALLLOG

Write Preview
Loading…
Cancel
Save