dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix instanceSettings

Browse Source
This commit is contained in:
Andras Bacsai
2023-05-16 17:09:50 +02:00
parent ab6d361e64
commit 4156ba8908
8 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Actions/Fortify/CreateNewUser.php
View File

@@ -23,7 +23,7 @@ class CreateNewUser implements CreatesNewUsers
*/
public function create(array $input): User
{
$settings = InstanceSettings::find(0);
$settings = InstanceSettings::get();
if (!$settings->is_registration_enabled) {
Log::info('Registration is disabled');
abort(403);

2
app/Actions/Proxy/InstallProxy.php
View File

@@ -63,7 +63,7 @@ class InstallProxy
protected function getEnvContents()
{
$instance_fqdn = InstanceSettings::find(1)->fqdn ?? config('app.url');
$instance_fqdn = InstanceSettings::get()->fqdn ?? config('app.url');
$url = Url::fromString($instance_fqdn);
$data = [
'TRAEFIK_DASHBOARD_HOST' => $url->getHost(),

2
app/Http/Livewire/Source/Github/Change.php
View File

@@ -48,7 +48,7 @@ class Change extends Component
}
public function mount()
{
$settings = InstanceSettings::first();
$settings = InstanceSettings::get();
if ($settings->fqdn) {
$this->host = $settings->fqdn;
}

4
app/Jobs/DeployApplicationJob.php
View File

@@ -43,6 +43,7 @@ class DeployApplicationJob implements ShouldQueue
public string $application_uuid,
public bool $force_rebuild = false,
) {
$this->application = Application::query()
->where('uuid', $this->application_uuid)
->firstOrFail();
@@ -100,8 +101,7 @@ class DeployApplicationJob implements ShouldQueue
public function handle(): void
{
try {
$coolify_instance_settings = InstanceSettings::find(0);
$deployment_type = $this->application->deploymentType();
$coolify_instance_settings = InstanceSettings::get();
if ($this->application->deploymentType() === 'source') {
$this->source = $this->application->source->getMorphClass()::where('id', $this->application->source->id)->first();
}

2
app/Models/Application.php
View File

@@ -48,8 +48,6 @@ class Application extends BaseModel
{
return $this->previews->modelScope();
}
public function publishDirectory(): Attribute
{
return Attribute::make(

4
app/Models/InstanceSettings.php
View File

@@ -6,4 +6,8 @@ use Illuminate\Database\Eloquent\Model;
class InstanceSettings extends Model
{
public static function get()
{
return InstanceSettings::findOrFail(0);
}
}

4
app/Providers/FortifyServiceProvider.php
View File

@@ -31,7 +31,7 @@ class FortifyServiceProvider extends ServiceProvider
public function boot(): void
{
Fortify::registerView(function () {
$settings = InstanceSettings::find(0);
$settings = InstanceSettings::get();
if (!$settings->is_registration_enabled) {
return redirect()->route('login');
}
@@ -39,7 +39,7 @@ class FortifyServiceProvider extends ServiceProvider
});
Fortify::loginView(function () {
$settings = InstanceSettings::find(0);
$settings = InstanceSettings::get();
return view('auth.login', [
'is_registration_enabled' => $settings->is_registration_enabled
]);