Merge pull request #324 from andreapollastri/3.x

Nobot + PHP Version FIX
andreapollastri · Dec 11, 2021 · 725e321 · 725e321
2 parents e78c48c + f0e887f
commit 725e321
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 (no unreleased versions)
 
+## [3.1.10] - 2021-12-11
+
+### Fixed
+- Default PHP Version
+- No bot meta in default pages
+
 ## [3.1.9] - 2021-12-11
 
 ### Fixed

diff --git a/database/migrations/2019_05_02_000000_create_servers_table.php b/database/migrations/2019_05_02_000000_create_servers_table.php
@@ -22,7 +22,7 @@ public function up()
             $table->string('database');
             $table->string('provider')->nullable();
             $table->string('location')->nullable();
-            $table->string('php')->default('8.1');
+            $table->string('php')->default(config('cipi.default_php'));
             $table->text('github_key')->nullable();
             $table->text('cron')->nullable();
             $table->boolean('default')->default(false);

diff --git a/database/migrations/2019_05_03_000000_create_sites_table.php b/database/migrations/2019_05_03_000000_create_sites_table.php
@@ -24,7 +24,7 @@ public function up()
             $table->string('basepath')->nullable()->default('/public');
             $table->string('repository')->nullable();
             $table->string('branch')->nullable();
-            $table->string('php')->default('8.1');
+            $table->string('php')->default(config('cipi.default_php'));
             $table->text('supervisor')->nullable();
             $table->text('nginx')->nullable();
             $table->text('deploy')->nullable();

diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
@@ -3,6 +3,8 @@
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="robots" content="noindex, nofollow">
+        <meta name="googlebot" content="noindex">
 
         <title>{{ config('cipi.name') }}</title>
 

diff --git a/storage/app/cipi/newsite.sh b/storage/app/cipi/newsite.sh
@@ -60,7 +60,7 @@ else
 fi
 sudo touch $WELCOME
 sudo cat > "$WELCOME" <<EOF
-<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Coming Soon</title> <style>html{font-family: Arial, sans-serif; color: #000; font-size: 16px; font-weight: 400;}main{margin: 3rem 0 0 3rem;}h1, p{margin-top: 0; margin-bottom: 1.8rem;}h1{font-weight: 700; font-size: 4.5rem;}p{color: #7d7d7d; font-size: 1.75rem;}@media screen and (max-width: 768px){html{font-size: 12px;}main{margin: 3rem 0 0 3rem;}}</style></head><body><main><h1>Coming Soon</h1><p><script>document.write(window.location.hostname);</script></p></main></body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="robots" content="noindex, nofollow"> <meta name="googlebot" content="noindex"> <title>Coming Soon</title> <style>html{font-family: Arial, sans-serif; color: #000; font-size: 16px; font-weight: 400;}main{margin: 3rem 0 0 3rem;}h1, p{margin-top: 0; margin-bottom: 1.8rem;}h1{font-weight: 700; font-size: 4.5rem;}p{color: #7d7d7d; font-size: 1.75rem;}@media screen and (max-width: 768px){html{font-size: 12px;}main{margin: 3rem 0 0 3rem;}}</style></head><body><main><h1>Coming Soon</h1><p><script>document.write(window.location.hostname);</script></p></main></body></html>
 EOF
 
 NGINX=/etc/nginx/sites-available/$USER_NAME.conf

diff --git a/storage/app/cipi/version.md b/storage/app/cipi/version.md
@@ -1 +1 @@
-3.1.9
+3.1.10
diff --git a/utility/zero-page/index.php b/utility/zero-page/index.php
@@ -29,6 +29,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><?php echo substr($quotes[$randquote]['quote'], 0, 21); ?>...</title>
+    <meta name="robots" content="noindex, nofollow">
+    <meta name="googlebot" content="noindex">
     <style>
         html {
             font-family: Arial, sans-serif;