Merge pull request #328 from andreapollastri/3.x

Fixes
andreapollastri · Dec 13, 2021 · 3f3d881 · 3f3d881
2 parents 725e321 + 712398e
commit 3f3d881
Show file tree

Hide file tree

Showing 26 changed files with 245 additions and 143 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 (no unreleased versions)
 
+## [3.1.11] - 2021-12-13
+
+### Added
+- Sites Log Rotation Logic
+
+### Fixed
+- Solved APP login issue
+- Solved PHP switch error
+- Cipi commands
+- Composer Update
+- Favicon
+- Readme file
+- Minor Fix
+
+### Removed
+- Unused namespaces
+
 ## [3.1.10] - 2021-12-11
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Visit website: https://cipi.sh
 Cipi Documentation is available at: https://cipi.sh/docs.html.
 
 ## Installation
-```
+```bash
 wget -O - https://cipi.sh/go.sh | bash
 ```
 #### Installation on AWS
@@ -46,27 +46,28 @@ $ ssh ubuntu@<your server IP address>
 $ ubuntu@aws:~$ sudo -s
 $ root@aws:~# wget -O - https://cipi.sh/go.sh | bash
 ```
-Remember to open ports: 22, 80 and 443.
+Remember to open ports: 22, 80 and 443!
 
 #### Installation Note
 Before you can use Cipi, please make sure your server fulfils these requirements:
 
 - Ubuntu 20.04 x86_64 LTS (Fresh installation)
-- If the server is virtual (VPS), OpenVZ may not be supported (Kernel 2.6)
+- If the server is virtual (VPS), OpenVZ may not be supported
+- We are checking Cipi compatibility within Oracle / ARM (not full supported yet)
 
-Hardware Requirement: More than 1GB of HDD / At least 1 core processor / 512MB minimum RAM / At least 1 public IP Address (NAT VPS is not supported) / External firewall / For VPS providers such as AWS, those providers already include an external firewall for your VPS. Please open port 22, 80 and 443 to install Cipi.
+Hardware Requirement: More than 1GB of HD / At least 1 core processor / 512MB minimum RAM / At least 1 public IP  Address (IPv6 and NAT VPS are not supported) / For VPS providers such as AWS, those providers already include an external firewall for your VPS. Please open port 22, 80 and 443 to install Cipi.
 
 Installation may take up to about 30 minutes which may also depend on your server's internet speed. After the installation is completed, you are ready to use Cipi to manage your servers.
 
-To correctly manage remote servers Cipi has to be on a public IP address. Do not use it in localhost!
+To correctly manage remote servers Cipi has to be on a public IP address (IPv4). Do not use it in localhost!
 
 ## Cipi LEMP environment
 - nginx: 1.18
 - PHP-FPM: 8.1, 8.0, 7.4
 - MySql: 8
 - node: 16
 - npm: 8
-- Composer: 2.x
+- Composer: 2
 
 ## Screenshots
 
@@ -80,16 +81,16 @@ To correctly manage remote servers Cipi has to be on a public IP address. Do not
 Cipi is easy, stable, powerful and free for any personal and commercial use and it's a perfect alternative to Runcloud, Ploi.io, Serverpilot, Forge, Moss.sh and similar software...
 
 ## Mobile App
-Christian Giupponi (co-founder of ZeroUno Agency - https://zerouno.io/) developed Cipi Mobile Application.<br>
-ANDROID VERSION: https://play.google.com/store/apps/details?id=it.christiangiupponi.cipi<br>
-IOS VERSION: Coming soon!<br><br>
+Christian Giupponi (https://zerouno.io) has developed the Cipi Mobile App.<br>
+Android: https://play.google.com/store/apps/details?id=it.christiangiupponi.cipi<br>
+iOS: Coming soon!<br><br>
 
 ## Cipi Roadmap... what's next? 
-
-<h4>Version 4 on May 2022</h4>
+- Cipi Version 4 (half 2022)
 - Laravel 9 support
 - Backup on s3
-- Minor Improvements!
+- Apps installer
+- ...
 
 ## Contributing
 Thank you for considering contributing to the Cipi Project (code, issues, feedbacks, stars, promo, beers) :)

diff --git a/app/Console/Commands/ActiveSetupCount.php b/app/Console/Commands/ActiveSetupCount.php
@@ -2,10 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Server;
-use phpseclib3\Net\SSH2;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Http;
 
 class ActiveSetupCount extends Command
 {

diff --git a/app/Console/Commands/CipiUpdate.php b/app/Console/Commands/CipiUpdate.php
@@ -5,7 +5,6 @@
 use App\Models\Server;
 use phpseclib3\Net\SSH2;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Http;
 
 class CipiUpdate extends Command
 {
@@ -58,22 +57,22 @@ public function handle()
             $server->save();
         }
 
-         // 2021-12-10 and 2021-12-09 patches
-         $servers = Server::where('build', '<', '202112101')->get();
+        // 2021-12-10 and 2021-12-09 patches
+        $servers = Server::where('build', '<', '202112101')->get();
 
-         foreach ($servers as $server) {
-             $ssh = new SSH2($server->ip, 22);
-             $ssh->login('cipi', $server->password);
-             $ssh->setTimeout(360);
-             $ssh->exec('echo '.$server->password.' | sudo -S sudo wget '.config('app.url').'/sh/client-patch/202112101');
-             $ssh->exec('echo '.$server->password.' | sudo -S sudo dos2unix 202112101');
-             $ssh->exec('echo '.$server->password.' | sudo -S sudo bash 202112101');
-             $ssh->exec('echo '.$server->password.' | sudo -S sudo unlink 202112101');
-             $ssh->exec('exit');
+        foreach ($servers as $server) {
+            $ssh = new SSH2($server->ip, 22);
+            $ssh->login('cipi', $server->password);
+            $ssh->setTimeout(360);
+            $ssh->exec('echo '.$server->password.' | sudo -S sudo wget '.config('app.url').'/sh/client-patch/202112101');
+            $ssh->exec('echo '.$server->password.' | sudo -S sudo dos2unix 202112101');
+            $ssh->exec('echo '.$server->password.' | sudo -S sudo bash 202112101');
+            $ssh->exec('echo '.$server->password.' | sudo -S sudo unlink 202112101');
+            $ssh->exec('exit');
 
-             $server->build = '202112101';
-             $server->save();
-         }
+            $server->build = '202112101';
+            $server->save();
+        }
 
         $server = Server::where('default', 1)->first();
 

diff --git a/app/Console/Commands/LogRotate.php b/app/Console/Commands/LogRotate.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Server;
+use phpseclib3\Net\SSH2;
+use Illuminate\Console\Command;
+
+class LogRotate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'cipi:logrotate';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Site Log Rotation';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $servers = Server::all();
+
+        foreach ($servers as $server) {
+            foreach ($server->sites as $site) {
+                $ssh = new SSH2($server->ip, 22);
+                $ssh->login('cipi', $server->password);
+                $ssh->setTimeout(360);
+                $ssh->exec('echo '.$server->password.' | sudo -S sudo unlink /home/'.$site->username.'/log/access_bk_'.date('N').'.log');
+                $ssh->exec('echo '.$server->password.' | sudo -S sudo mv /home/'.$site->username.'/log/access.log /home/'.$site->username.'/log/access_bk_'.date('N').'.log');
+                $ssh->exec('echo '.$server->password.' | sudo -S sudo unlink /home/'.$site->username.'/log/error_bk_'.date('N').'.log');
+                $ssh->exec('echo '.$server->password.' | sudo -S sudo mv /home/'.$site->username.'/log/error.log /home/'.$site->username.'/log/error_bk_'.date('N').'.log');
+                $ssh->exec('exit');
+            }
+        }
+
+        return 0;
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -13,7 +13,10 @@ class Kernel extends ConsoleKernel
      * @var array
      */
     protected $commands = [
-        //
+        \App\Console\Commands\ActiveSetupCount::class,
+        \App\Console\Commands\LogRotate::class,
+        \App\Console\Commands\ServerSetupCheck::class,
+        \App\Console\Commands\CipiUpdate::class,
     ];
 
     /**
@@ -25,9 +28,8 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         $schedule->command('servers:setupcheck')->everyMinute();
-
         $schedule->command('cipi:update')->dailyAt('12:05');
-
+        $schedule->command('cipi:logrotate')->dailyAt('00:00');
         $schedule->command('cipi:activesetupcount')->dailyAt('03:03');
     }
 
@@ -39,7 +41,6 @@ protected function schedule(Schedule $schedule)
     protected function commands()
     {
         $this->load(__DIR__.'/Commands');
-
         require base_path('routes/console.php');
     }
 }
diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
@@ -11,6 +11,32 @@
 class AuthController extends Controller
 {
 
+    /**
+     * Auth login via username and password for mobile app
+     *
+    */
+    public function appLogin(Request $request)
+    {
+        $request->validate([
+            'username' => 'required',
+            'password' => 'required',
+        ]);
+
+        $user = Auth::attempt($request->username, $request->password);
+
+        if (!$user) {
+            return response()->json([
+                'message' => __('cipi.invalid_login_message'),
+                'errors' => __('cipi.invalid_login')
+            ], 401);
+        }
+
+        return response()->json([
+            'username' => $user->username,
+            'apikey' => $user->apikey
+        ]);
+    }
+
     /**
      * JWT Auth login via username and password
      *

diff --git a/app/Http/Controllers/ShellController.php b/app/Http/Controllers/ShellController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Models\Site;
-use App\Models\Alias;
 use App\Models\Server;
 use Illuminate\Support\Str;
 use Illuminate\Support\Facades\Storage;

diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php
@@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware
      * @var array
      */
     protected $except = [
-        //
+        'app/login',
     ];
 }
diff --git a/app/Jobs/DeleteAliasSSH.php b/app/Jobs/DeleteAliasSSH.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\Alias;
 use phpseclib3\Net\SSH2;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Jobs/DeleteSiteSSH.php b/app/Jobs/DeleteSiteSSH.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\Site;
 use phpseclib3\Net\SSH2;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Jobs/EditSiteBasepathSSH.php b/app/Jobs/EditSiteBasepathSSH.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\Site;
 use phpseclib3\Net\SSH2;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Jobs/EditSiteDeploySSH.php b/app/Jobs/EditSiteDeploySSH.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\Site;
 use phpseclib3\Net\SSH2;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Jobs/EditSiteDomainSSH.php b/app/Jobs/EditSiteDomainSSH.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\Site;
 use phpseclib3\Net\SSH2;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Jobs/EditSitePhpSSH.php b/app/Jobs/EditSitePhpSSH.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\Site;
 use phpseclib3\Net\SSH2;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;
@@ -41,8 +40,10 @@ public function handle()
         $ssh->login('cipi', $this->site->server->password);
         $ssh->setTimeout(360);
         $ssh->exec('echo '.$this->site->server->password.' | sudo -S sudo rpl -i "php'.$this->oldphp.'-fpm" "php'.$this->site->php.'-fpm" /etc/nginx/sites-available/'.$this->site->username.'.conf');
+        $ssh->exec('echo '.$this->site->server->password.' | sudo -S sudo rpl -i "php'.$this->oldphp.'-fpm" "php'.$this->site->php.'-fpm" /etc/nginx/sites-enabled/'.$this->site->username.'.conf');
         foreach ($this->site->aliases as $alias) {
             $ssh->exec('echo '.$this->site->server->password.' | sudo -S sudo rpl -i "php'.$this->oldphp.'-fpm" "php'.$this->site->php.'-fpm" /etc/nginx/sites-available/'.$alias->domain.'.conf');
+            $ssh->exec('echo '.$this->site->server->password.' | sudo -S sudo rpl -i "php'.$this->oldphp.'-fpm" "php'.$this->site->php.'-fpm" /etc/nginx/sites-enabled/'.$alias->domain.'.conf');
         }
         $ssh->exec('echo '.$this->site->server->password.' | sudo -S sudo mv /etc/php/'.$this->oldphp.'/fpm/pool.d/'.$this->site->username.'.conf /etc/php/'.$this->site->php.'/fpm/pool.d/'.$this->site->username.'.conf');
         $ssh->exec('echo '.$this->site->server->password.' | sudo -S sudo rpl "listen = /run/php/php'.$this->oldphp.'-fpm-'.$this->site->username.'.sock" "listen = /run/php/php'.$this->site->php.'-fpm-'.$this->site->username.'.sock" /etc/php/'.$this->site->php.'/fpm/pool.d/'.$this->site->username.'.conf');

diff --git a/app/Jobs/EditSiteSupervisorSSH.php b/app/Jobs/EditSiteSupervisorSSH.php
@@ -2,7 +2,6 @@
 
 namespace App\Jobs;
 
-use App\Models\Site;
 use phpseclib3\Net\SSH2;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\SerializesModels;

diff --git a/app/Models/Server.php b/app/Models/Server.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\Cron;
 use App\Models\Site;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -18,7 +17,7 @@ class Server extends Model
         'created_at',
         'updated_at'
     ];
-    
+
     public function sites()
     {
         return $this->hasMany(Site::class)->where('panel', false);