diff --git a/app/Console/Commands/ExportDatas.php b/app/Console/Commands/ExportDatas.php
index c656508..7086967 100644
--- a/app/Console/Commands/ExportDatas.php
+++ b/app/Console/Commands/ExportDatas.php
@@ -86,7 +86,7 @@ class ExportDatas extends Command
private function ExportDomainNames($filename)
{
$domains = DomainNames::all();
- Storage::disk('export')->append($filename, "ASCII;UTF-8;DATE D'EXPIRATION;RENOUVELLEMENT;MARQUE REF.;COMMENTAIRE");
+ Storage::disk('export')->append($filename, "ASCII;UTF-8;DATE D'EXPIRATION;RENOUVELLEMENT;MARQUE REF.;DNS REDIRIGES;TYPE CERTIFICATS;COMMENTAIRE");
foreach ($domains as $domain) {
$infos = [
trim($domain->ascii_name),
@@ -94,6 +94,8 @@ class ExportDatas extends Command
trim($domain->expiration_date),
$domain->renew === 1 ? 'OUI' : 'NON',
trim($domain->related_brand),
+ trim($domain->redirect_dns),
+ trim($domain->certificats),
trim($domain->comment),
];
@@ -142,6 +144,7 @@ class ExportDatas extends Command
$fields = [
'DEV',
'name',
+ 'dev_haproxy_id',
'dev_url',
'https',
'php',
@@ -160,7 +163,7 @@ class ExportDatas extends Command
'dev_whitelist_fw',
];
- Storage::disk('export')->append($filename, "ENV;NOM;URL;HTTPS;PHP;SERVEUR WEB;SSH;USER UNIX;PWD UNIX;DOCUMENT ROOT;SERVEUR BDD;SSH;USER DB;PWD DB;HTACCESS USER;HTACCESS PWD;COMMENTAIRE;FLUX EAI;WHITELIST FW");
+ Storage::disk('export')->append($filename, "ENV;NOM;ID HAPROXY;URL;HTTPS;PHP;SERVEUR WEB;SSH;USER UNIX;PWD UNIX;DOCUMENT ROOT;SERVEUR BDD;SSH;USER DB;PWD DB;HTACCESS USER;HTACCESS PWD;COMMENTAIRE;FLUX EAI;WHITELIST FW");
$this->writeProjectExport($projects, $fields, $filename);
$prod = implode(";", $fields);
diff --git a/app/Http/Controllers/DomainNamesController.php b/app/Http/Controllers/DomainNamesController.php
index ad20f3e..72dd29c 100644
--- a/app/Http/Controllers/DomainNamesController.php
+++ b/app/Http/Controllers/DomainNamesController.php
@@ -12,35 +12,41 @@ use lfkeitel\phptotp\Totp;
class DomainNamesController extends Controller
{
- public function index(Request $request) {
+ public function index(Request $request)
+ {
$dms = DomainNames::all();
return view('domain-names.index', ['dms' => $dms]);
}
- public function add(Request $request) {
+ public function add(Request $request)
+ {
return view('domain-names.add');
}
- public function edit(Request $request) {
+ public function edit(Request $request)
+ {
$dm_id = $request->id;
$dm = DomainNames::findOrFail($dm_id);
return view('domain-names.edit', ['dm' => $dm]);
}
- public function update(Request $request) {
+ public function update(Request $request)
+ {
$dm_id = $request->id;
$dm = DomainNames::findOrFail($dm_id);
$this->makeChanges($request, $dm);
return redirect()->route('domain-names.edit', ['id' => $dm->id])->with('status', 'Sauvegardé !');
}
- public function store(Request $request) {
+ public function store(Request $request)
+ {
$dm = new DomainNames();
$this->makeChanges($request, $dm);
return redirect()->route('domain-names.edit', ['id' => $dm->id])->with('status', 'Sauvegardé !');
}
- public function delete(Request $request) {
+ public function delete(Request $request)
+ {
$dm_id = $request->id;
$dm = DomainNames::findOrFail($dm_id);
@@ -63,17 +69,20 @@ class DomainNamesController extends Controller
$dm = DomainNames::findOrFail($dm_id);
$dm->delete();
return redirect()->route('domain-names.index')->with('status', 'Nom de domaine supprimé !');
- }else{
+ } else {
return redirect()->route('domain-names.edit', ['id' => $dm_id])->with('error', 'Code de vérification invalide.');
}
}
- private function makeChanges($request, $dm) {
+ private function makeChanges($request, $dm)
+ {
$ascii_name = $request->ascii_name;
$utf8_name = $request->utf8_name;
$exp_date = $request->expiration_date;
$renew = $request->renew;
$related_brand = $request->related_brand;
+ $redirect_dns = $request->redirect_dns;
+ $certificats = $request->certificats;
$comment = $request->comment;
$dm->ascii_name = $ascii_name;
@@ -81,6 +90,8 @@ class DomainNamesController extends Controller
$dm->expiration_date = $exp_date;
$dm->renew = $renew;
$dm->related_brand = $related_brand;
+ $dm->redirect_dns = $redirect_dns;
+ $dm->certificats = $certificats;
$dm->comment = $comment;
$dm->save();
}
diff --git a/app/Http/Controllers/ProjectsController.php b/app/Http/Controllers/ProjectsController.php
index 82c3b33..9eec38b 100644
--- a/app/Http/Controllers/ProjectsController.php
+++ b/app/Http/Controllers/ProjectsController.php
@@ -6,6 +6,7 @@ use App\Http\Requests\Projects\StoreProjects;
use App\Http\Requests\Projects\UpdateProjects;
use App\Models\Projects;
use App\Models\Servers;
+use App\User;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -130,10 +131,10 @@ class ProjectsController extends Controller
$php = $request->php;
$type = $request->type;
$https = $request->https;
+ $prod_haproxy_id = $request->prod_haproxy_id;
+ $dev_haproxy_id = $request->dev_haproxy_id;
$prod_url = $request->prod_url;
$dev_url = $request->dev_url;
- $prod_certificats = $request->prod_certificats;
- $dev_certificats = $request->dev_certificats;
$prod_document_root = $request->prod_document_root;
$dev_document_root = $request->dev_document_root;
$prod_unix_user = $request->prod_unix_user;
@@ -156,8 +157,6 @@ class ProjectsController extends Controller
$dev_eai = $request->dev_eai;
$prod_whitelist_fw = $request->prod_whitelist_fw;
$dev_whitelist_fw = $request->dev_whitelist_fw;
- $prod_redirect_dns = $request->prod_redirect_dns;
- $dev_redirect_dns = $request->dev_redirect_dns;
$dev_htaccess_user = $request->dev_htaccess_user;
$dev_htaccess_pwd = $request->dev_htaccess_pwd;
$prod_ga_id = $request->prod_ga_id;
@@ -178,10 +177,10 @@ class ProjectsController extends Controller
$project->php = $php;
$project->type = $type;
$project->https = $https;
+ $project->prod_haproxy_id = $prod_haproxy_id;
+ $project->dev_haproxy_id = $dev_haproxy_id;
$project->prod_url = $prod_url;
$project->dev_url = $dev_url;
- $project->prod_certificats = $prod_certificats;
- $project->dev_certificats = $dev_certificats;
$project->prod_document_root = $prod_document_root;
$project->dev_document_root = $dev_document_root;
$project->prod_unix_user = $prod_unix_user;
@@ -204,8 +203,6 @@ class ProjectsController extends Controller
$project->dev_eai = $dev_eai;
$project->prod_whitelist_fw = $prod_whitelist_fw;
$project->dev_whitelist_fw = $dev_whitelist_fw;
- $project->prod_redirect_dns = $prod_redirect_dns;
- $project->dev_redirect_dns = $dev_redirect_dns;
$project->dev_htaccess_user = $dev_htaccess_user;
$project->dev_htaccess_pwd = $dev_htaccess_pwd;
$project->prod_ga_id = $prod_ga_id;
diff --git a/resources/views/domain-names/add.blade.php b/resources/views/domain-names/add.blade.php
index 8604b00..585ccc4 100644
--- a/resources/views/domain-names/add.blade.php
+++ b/resources/views/domain-names/add.blade.php
@@ -1,81 +1,96 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/domain-names/edit.blade.php b/resources/views/domain-names/edit.blade.php
index 8b390ca..350ad3c 100644
--- a/resources/views/domain-names/edit.blade.php
+++ b/resources/views/domain-names/edit.blade.php
@@ -1,82 +1,97 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @csrf
-
-
-
-
- Date d'expiration :
-
-
-
-
-
- Renouvellement ? :
-
- renew === 1) selected @endif>OUI
- renew === 0) selected @endif>NON
-
-
-
-
-
-
-
- Marque référente :
-
-
-
-
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
+ @csrf
+
+
+
+
+ Date d'expiration :
+
+
+
+
+
+ Renouvellement ? :
+
+ renew === 1) selected @endif>OUI
+ renew === 0) selected @endif>NON
+
+
+
+
+
+
+
+ Marque référente :
+
+
+
+
+
+
+
+
+ DNS Redirigés :
+ {{$dm->redirect_dns}}
+
+
+
+
+ Type Certificats :
+
+
+
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/dpccs/add.blade.php b/resources/views/dpccs/add.blade.php
index 616d1e1..b6a545e 100644
--- a/resources/views/dpccs/add.blade.php
+++ b/resources/views/dpccs/add.blade.php
@@ -1,50 +1,51 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @csrf
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
+ @csrf
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/dpccs/edit.blade.php b/resources/views/dpccs/edit.blade.php
index 09e09ba..047fb5f 100644
--- a/resources/views/dpccs/edit.blade.php
+++ b/resources/views/dpccs/edit.blade.php
@@ -1,51 +1,52 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @csrf
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
+ @csrf
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/email-addresses/add.blade.php b/resources/views/email-addresses/add.blade.php
index 4359778..d4688b6 100644
--- a/resources/views/email-addresses/add.blade.php
+++ b/resources/views/email-addresses/add.blade.php
@@ -1,60 +1,61 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @csrf
-
-
-
-
-
- Nom de domaine :
-
- @foreach($dms as $dm)
- {{$dm->utf8_name}}
- @endforeach
-
-
-
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
+ @csrf
+
+
+
+
+
+ Nom de domaine :
+
+ @foreach($dms as $dm)
+ {{$dm->utf8_name}}
+ @endforeach
+
+
+
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/email-addresses/edit.blade.php b/resources/views/email-addresses/edit.blade.php
index 2f956ad..a1a728b 100644
--- a/resources/views/email-addresses/edit.blade.php
+++ b/resources/views/email-addresses/edit.blade.php
@@ -1,61 +1,62 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @csrf
-
-
-
-
-
- Nom de domaine :
-
- @foreach($dms as $dm)
- domain_name_id === $dm->id) selected @endif>{{$dm->utf8_name}}
- @endforeach
-
-
-
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
+ @csrf
+
+
+
+
+
+ Nom de domaine :
+
+ @foreach($dms as $dm)
+ domain_name_id === $dm->id) selected @endif>{{$dm->utf8_name}}
+ @endforeach
+
+
+
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/git-repos/create.blade.php b/resources/views/git-repos/create.blade.php
index e6199ce..43c0b8a 100644
--- a/resources/views/git-repos/create.blade.php
+++ b/resources/views/git-repos/create.blade.php
@@ -1,66 +1,66 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
- @if ($errors->any())
-
-
- @foreach ($errors->all() as $error)
- {{ $error }}
- @endforeach
-
-
- @endif
-
- @csrf
-
-
-
- {{ __('Nom') }} :
-
-
-
-
-
- {{ __('Identifiant') }} :
-
-
-
-
-
- {{ __('Mot de passe') }} :
-
-
-
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+ @if ($errors->any())
+
+
+ @foreach ($errors->all() as $error)
+ {{ $error }}
+ @endforeach
+
+
+ @endif
+
+ @csrf
+
+
+
+ {{ __('Nom') }} :
+
+
+
+
+
+ {{ __('Identifiant') }} :
+
+
+
+
+
+ {{ __('Mot de passe') }} :
+
+
+
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/git-repos/edit.blade.php b/resources/views/git-repos/edit.blade.php
index 42b61bf..fd8cfdd 100644
--- a/resources/views/git-repos/edit.blade.php
+++ b/resources/views/git-repos/edit.blade.php
@@ -1,73 +1,71 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
- @if ($errors->any())
-
-
- @foreach ($errors->all() as $error)
- {{ $error }}
- @endforeach
-
-
- @endif
-
- @csrf
- @method('PUT')
-
-
-
- {{ __('Nom') }} :
-
-
-
-
-
- {{ __('Identifiant') }} :
-
-
-
-
-
- {{ __('Mot de passe') }} :
-
-
-
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+ @if ($errors->any())
+
+
+ @foreach ($errors->all() as $error)
+ {{ $error }}
+ @endforeach
+
+
+ @endif
+
+ @csrf
+ @method('PUT')
+
+
+
+ {{ __('Nom') }} :
+
+
+
+
+
+ {{ __('Identifiant') }} :
+
+
+
+
+
+ {{ __('Mot de passe') }} :
+
+
+
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/ldc-networks/add.blade.php b/resources/views/ldc-networks/add.blade.php
index 24b8c5e..17480de 100644
--- a/resources/views/ldc-networks/add.blade.php
+++ b/resources/views/ldc-networks/add.blade.php
@@ -1,43 +1,45 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @csrf
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
+ @csrf
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/ldc-networks/edit.blade.php b/resources/views/ldc-networks/edit.blade.php
index ab46394..c15e2d5 100644
--- a/resources/views/ldc-networks/edit.blade.php
+++ b/resources/views/ldc-networks/edit.blade.php
@@ -1,58 +1,60 @@
@extends('layouts.app')
@section('content')
-
-
-
-
-
+
+
+
+
+
-
- @if (session('status'))
-
- {{ session('status') }}
-
- @endif
- @if (session('error'))
-
- {{ session('error') }}
-
- @endif
-
- @csrf
-
-
-
-
+
+ @if (session('status'))
+
+ {{ session('status') }}
+ @endif
+ @if (session('error'))
+
+ {{ session('error') }}
+
+ @endif
+
+ @csrf
+
+
+
+
-@endsection
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/projects/add.blade.php b/resources/views/projects/add.blade.php
index 012917b..b3b7e77 100644
--- a/resources/views/projects/add.blade.php
+++ b/resources/views/projects/add.blade.php
@@ -12,73 +12,73 @@
@if (session('status'))
-
- {{ session('status') }}
-
+
+ {{ session('status') }}
+
@endif
@if ($errors->any())
-
-
- @foreach ($errors->all() as $error)
- {{ $error }}
- @endforeach
-
-
+
+
+ @foreach ($errors->all() as $error)
+ {{ $error }}
+ @endforeach
+
+
@endif
- @csrf
-