New Server
@@ -970,12 +940,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
if (firstInput) firstInput.focus();
}, 200);
}
- })"
- class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-
+
New Team
@@ -1012,12 +980,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
if (firstInput) firstInput.focus();
}, 200);
}
- })"
- class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-
+
New S3 Storage
@@ -1054,12 +1020,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
if (firstInput) firstInput.focus();
}, 200);
}
- })"
- class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-
+
New Private Key
@@ -1096,12 +1060,10 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
if (firstInput) firstInput.focus();
}, 200);
}
- })"
- class="fixed top-0 left-0 lg:px-0 px-4 z-99 flex items-center justify-center w-screen h-screen">
-
+
New GitHub App
@@ -1128,4 +1090,4 @@ class="absolute top-0 right-0 flex items-center justify-center w-8 h-8 mt-5 mr-5
-
+
\ No newline at end of file
diff --git a/resources/views/livewire/security/cloud-init-script-form.blade.php b/resources/views/livewire/security/cloud-init-script-form.blade.php
new file mode 100644
index 000000000..83bedffab
--- /dev/null
+++ b/resources/views/livewire/security/cloud-init-script-form.blade.php
@@ -0,0 +1,17 @@
+
\ No newline at end of file
diff --git a/resources/views/livewire/security/cloud-init-scripts.blade.php b/resources/views/livewire/security/cloud-init-scripts.blade.php
new file mode 100644
index 000000000..e2013a4fb
--- /dev/null
+++ b/resources/views/livewire/security/cloud-init-scripts.blade.php
@@ -0,0 +1,50 @@
+
+
+
+
Cloud-Init Scripts
+ @can('create', App\Models\CloudInitScript::class)
+
+
+
+ @endcan
+
+
Manage reusable cloud-init scripts for server initialization. Currently working only with Hetzner's integration.
+
+
+ @forelse ($scripts as $script)
+
+
+
+
{{ $script->name }}
+
+ Created {{ $script->created_at->diffForHumans() }}
+
+
+
+
+
+ @can('update', $script)
+
+
+
+ @endcan
+
+ @can('delete', $script)
+
+ @endcan
+
+
+ @empty
+
No cloud-init scripts found. Create one to get started.
+ @endforelse
+
+
diff --git a/resources/views/livewire/server/new/by-hetzner.blade.php b/resources/views/livewire/server/new/by-hetzner.blade.php
index 8f03bc9b7..4e9bcedc2 100644
--- a/resources/views/livewire/server/new/by-hetzner.blade.php
+++ b/resources/views/livewire/server/new/by-hetzner.blade.php
@@ -18,7 +18,8 @@
-
+
Continue
@@ -48,8 +49,7 @@
-
+
@foreach ($locations as $location)
-
+
@@ -111,8 +111,7 @@ class="p-4 border border-yellow-500 dark:border-yellow-600 rounded bg-yellow-50
No private keys found. You need to create a private key to continue.
-
+
@@ -156,6 +155,35 @@ class="p-4 border border-yellow-500 dark:border-yellow-600 rounded bg-yellow-50
+
+
+
+ @if ($saved_cloud_init_scripts->count() > 0)
+
+
+
+ @foreach ($saved_cloud_init_scripts as $script)
+
+ @endforeach
+
+
+ Clear
+
+
+ @endif
+
+
+
+
+
+
Back
@@ -169,4 +197,4 @@ class="p-4 border border-yellow-500 dark:border-yellow-600 rounded bg-yellow-50
@endif
@endif
@endif
-
+
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 312bfb193..fd185496d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -34,6 +34,7 @@
use App\Livewire\Project\Shared\ScheduledTask\Show as ScheduledTaskShow;
use App\Livewire\Project\Show as ProjectShow;
use App\Livewire\Security\ApiTokens;
+use App\Livewire\Security\CloudInitScripts;
use App\Livewire\Security\CloudTokens;
use App\Livewire\Security\PrivateKey\Index as SecurityPrivateKeyIndex;
use App\Livewire\Security\PrivateKey\Show as SecurityPrivateKeyShow;
@@ -275,6 +276,7 @@
Route::get('/security/private-key/{private_key_uuid}', SecurityPrivateKeyShow::class)->name('security.private-key.show');
Route::get('/security/cloud-tokens', CloudTokens::class)->name('security.cloud-tokens');
+ Route::get('/security/cloud-init-scripts', CloudInitScripts::class)->name('security.cloud-init-scripts');
Route::get('/security/api-tokens', ApiTokens::class)->name('security.api-tokens');
});
diff --git a/tests/Feature/CloudInitScriptTest.php b/tests/Feature/CloudInitScriptTest.php
new file mode 100644
index 000000000..881f0071c
--- /dev/null
+++ b/tests/Feature/CloudInitScriptTest.php
@@ -0,0 +1,101 @@
+ 'test-server',
+ 'server_type' => 'cx11',
+ 'image' => 1,
+ 'location' => 'nbg1',
+ 'start_after_create' => true,
+ 'ssh_keys' => [123],
+ 'public_net' => [
+ 'enable_ipv4' => true,
+ 'enable_ipv6' => true,
+ ],
+ ];
+
+ // Add cloud-init script if provided
+ if (! empty($cloudInitScript)) {
+ $params['user_data'] = $cloudInitScript;
+ }
+
+ expect($params)
+ ->toHaveKey('user_data')
+ ->and($params['user_data'])->toBe("#!/bin/bash\necho 'Hello World'");
+});
+
+it('validates cloud-init script is not included when empty', function () {
+ $cloudInitScript = null;
+ $params = [
+ 'name' => 'test-server',
+ 'server_type' => 'cx11',
+ 'image' => 1,
+ 'location' => 'nbg1',
+ 'start_after_create' => true,
+ 'ssh_keys' => [123],
+ 'public_net' => [
+ 'enable_ipv4' => true,
+ 'enable_ipv6' => true,
+ ],
+ ];
+
+ // Add cloud-init script if provided
+ if (! empty($cloudInitScript)) {
+ $params['user_data'] = $cloudInitScript;
+ }
+
+ expect($params)->not->toHaveKey('user_data');
+});
+
+it('validates cloud-init script is not included when empty string', function () {
+ $cloudInitScript = '';
+ $params = [
+ 'name' => 'test-server',
+ 'server_type' => 'cx11',
+ 'image' => 1,
+ 'location' => 'nbg1',
+ 'start_after_create' => true,
+ 'ssh_keys' => [123],
+ 'public_net' => [
+ 'enable_ipv4' => true,
+ 'enable_ipv6' => true,
+ ],
+ ];
+
+ // Add cloud-init script if provided
+ if (! empty($cloudInitScript)) {
+ $params['user_data'] = $cloudInitScript;
+ }
+
+ expect($params)->not->toHaveKey('user_data');
+});
+
+it('validates cloud-init script with multiline content', function () {
+ $cloudInitScript = "#cloud-config\n\npackages:\n - nginx\n - git\n\nruncmd:\n - systemctl start nginx";
+ $params = [
+ 'name' => 'test-server',
+ 'server_type' => 'cx11',
+ 'image' => 1,
+ 'location' => 'nbg1',
+ 'start_after_create' => true,
+ 'ssh_keys' => [123],
+ 'public_net' => [
+ 'enable_ipv4' => true,
+ 'enable_ipv6' => true,
+ ],
+ ];
+
+ // Add cloud-init script if provided
+ if (! empty($cloudInitScript)) {
+ $params['user_data'] = $cloudInitScript;
+ }
+
+ expect($params)
+ ->toHaveKey('user_data')
+ ->and($params['user_data'])->toContain('#cloud-config')
+ ->and($params['user_data'])->toContain('packages:')
+ ->and($params['user_data'])->toContain('runcmd:');
+});
diff --git a/tests/Unit/CloudInitScriptValidationTest.php b/tests/Unit/CloudInitScriptValidationTest.php
new file mode 100644
index 000000000..bb4657502
--- /dev/null
+++ b/tests/Unit/CloudInitScriptValidationTest.php
@@ -0,0 +1,76 @@
+toBeFalse()
+ ->and($hasValue)->toBeFalse();
+});
+
+it('validates cloud-init script name is required when saving', function () {
+ $saveScript = true;
+ $scriptName = 'My Installation Script';
+
+ $isNameRequired = $saveScript;
+ $hasName = ! empty($scriptName);
+
+ expect($isNameRequired)->toBeTrue()
+ ->and($hasName)->toBeTrue();
+});
+
+it('validates cloud-init script description is optional', function () {
+ $scriptDescription = null;
+
+ $isDescriptionRequired = false;
+ $hasDescription = ! empty($scriptDescription);
+
+ expect($isDescriptionRequired)->toBeFalse()
+ ->and($hasDescription)->toBeFalse();
+});
+
+it('validates save_cloud_init_script must be boolean', function () {
+ $saveCloudInitScript = true;
+
+ expect($saveCloudInitScript)->toBeBool();
+});
+
+it('validates save_cloud_init_script defaults to false', function () {
+ $saveCloudInitScript = false;
+
+ expect($saveCloudInitScript)->toBeFalse();
+});
+
+it('validates cloud-init script can be a bash script', function () {
+ $cloudInitScript = "#!/bin/bash\napt-get update\napt-get install -y nginx";
+
+ expect($cloudInitScript)->toBeString()
+ ->and($cloudInitScript)->toContain('#!/bin/bash');
+});
+
+it('validates cloud-init script can be cloud-config yaml', function () {
+ $cloudInitScript = "#cloud-config\npackages:\n - nginx\n - git";
+
+ expect($cloudInitScript)->toBeString()
+ ->and($cloudInitScript)->toContain('#cloud-config');
+});
+
+it('validates script name max length is 255 characters', function () {
+ $scriptName = str_repeat('a', 255);
+
+ expect(strlen($scriptName))->toBe(255)
+ ->and(strlen($scriptName))->toBeLessThanOrEqual(255);
+});
+
+it('validates script name exceeding 255 characters should be invalid', function () {
+ $scriptName = str_repeat('a', 256);
+
+ $isValid = strlen($scriptName) <= 255;
+
+ expect($isValid)->toBeFalse()
+ ->and(strlen($scriptName))->toBeGreaterThan(255);
+});
diff --git a/tests/Unit/Rules/ValidCloudInitYamlTest.php b/tests/Unit/Rules/ValidCloudInitYamlTest.php
new file mode 100644
index 000000000..f3ea906af
--- /dev/null
+++ b/tests/Unit/Rules/ValidCloudInitYamlTest.php
@@ -0,0 +1,174 @@
+validate('script', $script, function ($message) use (&$valid) {
+ $valid = false;
+ });
+
+ expect($valid)->toBeTrue();
+});
+
+it('accepts valid cloud-config YAML without header', function () {
+ $rule = new ValidCloudInitYaml;
+ $valid = true;
+
+ $script = <<<'YAML'
+users:
+ - name: demo
+ groups: sudo
+packages:
+ - nginx
+YAML;
+
+ $rule->validate('script', $script, function ($message) use (&$valid) {
+ $valid = false;
+ });
+
+ expect($valid)->toBeTrue();
+});
+
+it('accepts valid bash script with shebang', function () {
+ $rule = new ValidCloudInitYaml;
+ $valid = true;
+
+ $script = <<<'BASH'
+#!/bin/bash
+apt update
+apt install -y nginx
+systemctl start nginx
+BASH;
+
+ $rule->validate('script', $script, function ($message) use (&$valid) {
+ $valid = false;
+ });
+
+ expect($valid)->toBeTrue();
+});
+
+it('accepts empty or null script', function () {
+ $rule = new ValidCloudInitYaml;
+ $valid = true;
+
+ $rule->validate('script', '', function ($message) use (&$valid) {
+ $valid = false;
+ });
+
+ expect($valid)->toBeTrue();
+
+ $rule->validate('script', null, function ($message) use (&$valid) {
+ $valid = false;
+ });
+
+ expect($valid)->toBeTrue();
+});
+
+it('rejects invalid YAML format', function () {
+ $rule = new ValidCloudInitYaml;
+ $valid = true;
+ $errorMessage = '';
+
+ $script = <<<'YAML'
+#cloud-config
+users:
+ - name: demo
+ groups: sudo
+ invalid_indentation
+packages:
+ - nginx
+YAML;
+
+ $rule->validate('script', $script, function ($message) use (&$valid, &$errorMessage) {
+ $valid = false;
+ $errorMessage = $message;
+ });
+
+ expect($valid)->toBeFalse();
+ expect($errorMessage)->toContain('YAML');
+});
+
+it('rejects script that is neither bash nor valid YAML', function () {
+ $rule = new ValidCloudInitYaml;
+ $valid = true;
+ $errorMessage = '';
+
+ $script = <<<'INVALID'
+this is not valid YAML
+ and has invalid indentation:
+ - item
+ without proper structure {
+INVALID;
+
+ $rule->validate('script', $script, function ($message) use (&$valid, &$errorMessage) {
+ $valid = false;
+ $errorMessage = $message;
+ });
+
+ expect($valid)->toBeFalse();
+ expect($errorMessage)->toContain('bash script');
+});
+
+it('accepts complex cloud-config with multiple sections', function () {
+ $rule = new ValidCloudInitYaml;
+ $valid = true;
+
+ $script = <<<'YAML'
+#cloud-config
+users:
+ - name: coolify
+ groups: sudo, docker
+ shell: /bin/bash
+ sudo: ['ALL=(ALL) NOPASSWD:ALL']
+ ssh_authorized_keys:
+ - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQ...
+
+packages:
+ - docker.io
+ - docker-compose
+ - git
+ - curl
+
+package_update: true
+package_upgrade: true
+
+runcmd:
+ - systemctl enable docker
+ - systemctl start docker
+ - usermod -aG docker coolify
+ - echo "Server setup complete"
+
+write_files:
+ - path: /etc/docker/daemon.json
+ content: |
+ {
+ "log-driver": "json-file",
+ "log-opts": {
+ "max-size": "10m",
+ "max-file": "3"
+ }
+ }
+YAML;
+
+ $rule->validate('script', $script, function ($message) use (&$valid) {
+ $valid = false;
+ });
+
+ expect($valid)->toBeTrue();
+});