Merge pull request #22 from joglomedia/1.2.0

1.2.0 several bugs fix and enhancements

.env

@@ -6,6 +6,9 @@
 # Server IP address, leave blank for auto detection.
 IP_SERVER=""
 
+# Default account username.
+LEMPER_USERNAME="lemper"
+
 # Password for default lemper account,
 # leave blank for auto generated secure password.
 LEMPER_PASSWORD=""
@@ -24,6 +27,9 @@ FORCE_REMOVE=false
 # Dry run install, true for testing only.
 DRYRUN=false
 
+# Build directorty.
+BUILD_DIR="/usr/local/src/lemper"
+
 # Logging for installation process.
 LOGGING=true
 
@@ -73,9 +79,12 @@ NGX_HEADERS_MORE=true
 NGX_HTTP_AUTH_PAM=false
 NGX_HTTP_GEOIP2=false
 NGX_HTTP_SUBS_FILTER=false
+NGX_MEMCACHED=true
 NGX_NAXSI=true
 NGX_NCHAN=false
 NGX_PAGESPEED=true
+NGX_REDIS2=true
+NGX_RTMP=false
 NGX_UPSTREAM_FAIR=false
 NGX_VTS=true
 NGX_WEB_DAV_EXT=false
@@ -94,14 +103,15 @@ PHP_VERSION="7.3"
 PHP_LOADER="ioncube"
 
 PHP_IMAGEMAGICK=false
+PHP_PHALCON_INSTALLER="repo"
 
 [mysql]
 INSTALL_MYSQL=true
 MYSQL_SERVER="mariadb"
 MYSQL_VERSION="10.4"
 
 #MYSQL_ROOT_PASS=""
-#MARIABACKUP_USER="lempersh"
+#MARIABACKUP_USER="lemperdb"
 #MARIABACKUP_PASS=""
 
 [memcached]

etc/nginx/includes/rules_fastcgi_cache.conf

@@ -54,7 +54,7 @@ if ($http_cookie ~* "(comment_author|wordpress_[a-f0-9]+|wp-postpass|wordpress_n
 }
 
 # Skip cache on WooCommerce pages
-if ($request_uri ~* "(/cart*|/my-account*|/checkout*|/addons*)") {
+if ($request_uri ~* "(/addons.*|/basket.*|/cart.*|/checkout.*|/my-account.*|/shop.*)") {
 	set $skip_cache 1;
 }
 

etc/nginx/ssl/ssl.sample-site.dev/ssl.sample-site.dev.crt

@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFIjCCBAqgAwIBAgIRAPTSpmfYKQriz3U34Q9umCwwDQYJKoZIhvcNAQEFBQAw
-cjELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGDAWBgNV
-BAMTD0Vzc2VudGlhbFNTTCBDQTAeFw0xMzExMTMwMDAwMDBaFw0xNDAyMTEyMzU5
-NTlaMFQxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDERMA8GA1UE
-CxMIRnJlZSBTU0wxHDAaBgNVBAMTE3N0cmlwaWZ5Lm1hc2VkaS5uZXQwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKtxFzJi0vVItzo3fCJhl5v+rV3dun
-lDEiWAfUaubs/K+viMphOBwn16TZpIkfI3T5NJDRzZ0B9wWnyU8aeNC/DGQUzpg7
-SfgJbLApRVP44fWUH71qxRd94+qgqSnQzUAw1LHbITrV5pZazFsbWmyxnBvz4mCL
-NGIWg8SFpSMKQW6L+BUGiO6c16klJF0cVP3+xkp9bOpyFsbHvNJynuQi/jMxU4sS
-HJv0UdXn8N16YRMCDvr7ETOYgDNn1PAvCKrbAxEhBAAfA71zSp0IoQnp2/hW9WHL
-opFLAXqLa1URvq+yDhdtTC2VEYekI0xEzntJfQYjdnT0vuL3xsuX1ll7AgMBAAGj
-ggHPMIIByzAfBgNVHSMEGDAWgBTay+qtWwhdzP/8JlTOSeVVxjj0+DAdBgNVHQ4E
-FgQUYrxhao7ftaE/Hc8AUkn30ZwuupMwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwNAYDVR0lBC0wKwYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMD
-BglghkgBhvhCBAEwTwYDVR0gBEgwRjA6BgsrBgEEAbIxAQICBzArMCkGCCsGAQUF
-BwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8uY29tL0NQUzAIBgZngQwBAgEwOwYD
-VR0fBDQwMjAwoC6gLIYqaHR0cDovL2NybC5jb21vZG9jYS5jb20vRXNzZW50aWFs
-U1NMQ0EuY3JsMG4GCCsGAQUFBwEBBGIwYDA4BggrBgEFBQcwAoYsaHR0cDovL2Ny
-dC5jb21vZG9jYS5jb20vRXNzZW50aWFsU1NMQ0FfMi5jcnQwJAYIKwYBBQUHMAGG
-GGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTA3BgNVHREEMDAughNzdHJpcGlmeS5t
-YXNlZGkubmV0ghd3d3cuc3RyaXBpZnkubWFzZWRpLm5ldDANBgkqhkiG9w0BAQUF
-AAOCAQEANZ0glAQ2Ym+g6csmhdvSLZbVxk39EYv3lZlCgGbnpXuZ9yyVOVrWC8ay
-9vdnOBvkt/toer8lCvnC3CUe3B6iwAwQIz3qHWTq+bVk16S8Fc0QXUY3ZbFOg/bF
-DHwAK3WSLqbNaF+JZlVDbOThNPpSLbufTtXawqaj53vAawBgPB4nMq05dzrUx3ZW
-dJBnJ0l2m1jKwAiKCllGNh0VZlmZWz0v6ebcYjZZFpis9fQ/bcoeFclU4edubsuO
-ALgBmRSdByuw91evIffMPcsOq49tdJ4VelHLvR7na/NsMYhlYmVEq4EXCibQ0SA4
-2Zvm8tgakyrChUaEh3PU4Ru0xCtPLw==
------END CERTIFICATE-----

etc/nginx/ssl/ssl.sample-site.dev/ssl.sample-site.dev.key

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDKtxFzJi0vVItz
-o3fCJhl5v+rV3dunlDEiWAfUaubs/K+viMphOBwn16TZpIkfI3T5NJDRzZ0B9wWn
-yU8aeNC/DGQUzpg7SfgJbLApRVP44fWUH71qxRd94+qgqSnQzUAw1LHbITrV5pZa
-zFsbWmyxnBvz4mCLNGIWg8SFpSMKQW6L+BUGiO6c16klJF0cVP3+xkp9bOpyFsbH
-vNJynuQi/jMxU4sSHJv0UdXn8N16YRMCDvr7ETOYgDNn1PAvCKrbAxEhBAAfA71z
-Sp0IoQnp2/hW9WHLopFLAXqLa1URvq+yDhdtTC2VEYekI0xEzntJfQYjdnT0vuL3
-xsuX1ll7AgMBAAECggEBAMdVlTchxzTPcgFYMR8cz9hEu+tpqeDzfA1Few2JwWIw
-Z6G4ZSmMP0N+bYAGpz+TYibbZbyo70dLXKhM8BgbzUjQKmm7bT5/0gOSePdcUOJf
-b1kkjOI8xIjqYYFyVsgXzJM301yjJHPJtve6E6ymElPkKih75mt8KyfwkoLIi9g8
-FrbeCpFUzrVGd6gNnN68uwix7uu/fRJbbWfkGeinTZhZRxb/aoHoKPhy8xOzftZr
-r1KARnqycK0coxqBJSbVIHCMu5z0axlXh0JCl2yEhfN+78DXZxkfK05LASOciWXQ
-2V0OiESjMdKyijCxuxAlfxGn6RTq4fD2xZVDTNflSQECgYEA7oD++8RQR7B/BX2C
-qo2dnA2SQL+HlQy/+1D2RUxuAL58u5p2cbx0qt0PWzsPbjIBfST7iydvTo2NNE1h
-M/QvgW8QuYIeSMH5ZlBP0ZJMSnwcN7b4iXB+Bc/mq0nWW/EMu2GxOSigRZYYfWKz
-0Qmpg+iHVr4T/yX86cNYsgb8P1sCgYEA2ZX5RIt90e21Rd0INu8IosRLgj46Vy8f
-BcxJzz9jJ4+ikVh0YSKbhTqNGXOCIjnCuwl1J6zjtmyJ9twlt8fkhp/WhMXPrUxY
-f+84J4Pinh+px6YsEdvnhsWOE4IahcpbbAUT1Wex1tfqEYEfOR9Fgv1VvmiYMCGz
-DwmGMj7uiGECgYALQKLHFhgDidw0UhucGFpbRnij/WVULunP3Z4A3v5BorsXzs3P
-x+hpN0zGLR8pP8q6MMh9ZDroJd2Hni772IV1Qdw0JGNxY1V08k0Rwik/SmO6bTOE
-qH4JoClt42ntpI3JOW63F6eYIOC+6a06K46H3qyj9wvSeeRY0xKYM6QrCQKBgFBv
-S5WWR23qhP+NpTLBjJy3Gf7MyD5gkgRPr91oXlxKkdtPKr6Zz4ohyfVlqO7EEYOZ
-DHEdTZSrbRkP6vWUdJt7zQ6KHaq/tVud8FFTRNwVcmr2uAXmGCHPOCVoDCv3UXKO
-MfXK/oggi0vrQsKYF9dDlYXtHo10d8AQUkaS0xUhAoGAOI8FpRk+NVJwGckeOkWc
-h3Z0tOMcL08mUeJrGK0OsqALpJIOY96Ieic+TiwXmiEcptefkPmQzRyMZaarWvld
-hrMcv4f4QXAVTtqeonfJyv+a1DVdrnOadNukNZcdyoy4kvaecNP0x6hKf0rCZhL/
-FXZU+CQ730C9zN3kU91kNO8=
------END PRIVATE KEY-----

lemper.sh

@@ -87,13 +87,13 @@ case "${1}" in
         ### Clean-up server ###
         echo ""
         if [ -f scripts/cleanup_server.sh ]; then
-            ./scripts/cleanup_server.sh
+            . ./scripts/cleanup_server.sh
         fi
 
         ### Install dependencies packages ###
         echo ""
         if [ -f scripts/install_dependencies.sh ]; then
-            ./scripts/install_dependencies.sh
+            . ./scripts/install_dependencies.sh
         fi
 
         ### Check and enable swap ###
@@ -102,72 +102,72 @@ case "${1}" in
 
         ### Create default account ###
         echo ""
-        create_account "lemper"
+        create_account "${LEMPER_USERNAME}"
 
         ### Nginx installation ###
         echo ""
         if [ -f scripts/install_nginx.sh ]; then
-            ./scripts/install_nginx.sh
+            . ./scripts/install_nginx.sh
         fi
 
         ### PHP installation ###
         echo ""
         if [ -f scripts/install_php.sh ]; then
-            ./scripts/install_php.sh
+            . ./scripts/install_php.sh
         fi
 
         ### Imagick installation ###
         echo ""
         if [ -f scripts/install_imagemagick.sh ]; then
-            ./scripts/install_imagemagick.sh
+            . ./scripts/install_imagemagick.sh
         fi
 
         ### Memcached installation ###
         echo ""
         if [ -f scripts/install_memcached.sh ]; then
-            ./scripts/install_memcached.sh
+            . ./scripts/install_memcached.sh
         fi
 
         ### MySQL database installation ###
         echo ""
         if [ -f scripts/install_mariadb.sh ]; then
-            ./scripts/install_mariadb.sh
+            . ./scripts/install_mariadb.sh
         fi
 
         ### Redis database installation ###
         echo ""
         if [ -f scripts/install_redis.sh ]; then
-            ./scripts/install_redis.sh
+            . ./scripts/install_redis.sh
         fi
 
         ### MongoDB database installation ###
         echo ""
         if [ -f scripts/install_mongodb.sh ]; then
-            ./scripts/install_mongodb.sh
+            . ./scripts/install_mongodb.sh
         fi
 
         ### Certbot Let's Encrypt SSL installation ###
         echo ""
         if [ -f scripts/install_certbotle.sh ]; then
-            ./scripts/install_certbotle.sh
+            . ./scripts/install_certbotle.sh
         fi
 
         ### Mail server installation ###
         echo ""
         if [ -f scripts/install_mailer.sh ]; then
-            ./scripts/install_mailer.sh
+            . ./scripts/install_mailer.sh
         fi
 
         ### Addon-tools installation ###
         echo ""
         if [ -f scripts/install_tools.sh ]; then
-            ./scripts/install_tools.sh
+            . ./scripts/install_tools.sh
         fi
 
         ### Basic server security ###
         echo ""
         if [ -f scripts/secure_server.sh ]; then
-            ./scripts/secure_server.sh
+            . ./scripts/secure_server.sh
         fi
 
         ### FINAL STEP ###
@@ -227,37 +227,37 @@ Now, you can reboot your server and enjoy it!"
         ### Remove Nginx ###
         echo ""
         if [ -f scripts/remove_nginx.sh ]; then
-            ./scripts/remove_nginx.sh
+            . ./scripts/remove_nginx.sh
         fi
 
         ### Remove PHP & FPM ###
         echo ""
         if [ -f scripts/remove_php.sh ]; then
-            ./scripts/remove_php.sh
+            . ./scripts/remove_php.sh
         fi
 
         ### Remove PHP & FPM ###
         echo ""
         if [ -f scripts/remove_memcached.sh ]; then
-            ./scripts/remove_memcached.sh
+            . ./scripts/remove_memcached.sh
         fi
 
         ### Remove MySQL ###
         echo ""
         if [ -f scripts/remove_mariadb.sh ]; then
-            ./scripts/remove_mariadb.sh
+            . ./scripts/remove_mariadb.sh
         fi
 
         ### Remove Redis ###
         echo ""
         if [ -f scripts/remove_redis.sh ]; then
-            ./scripts/remove_redis.sh
+            . ./scripts/remove_redis.sh
         fi
 
         ### Remove Certbot LE ###
         echo ""
         if [ -f scripts/remove_certbotle.sh ]; then
-            ./scripts/remove_certbotle.sh
+            . ./scripts/remove_certbotle.sh
         fi
 
         # Remove default user account.