diff --git a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart index fb44a4dd..dafda8c4 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/digital_ocean/digital_ocean.dart @@ -294,6 +294,7 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { required final String dnsApiToken, required final User rootUser, required final String domainName, + required final String serverType, }) async { ServerHostingDetails? details; @@ -307,6 +308,7 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { rootUser: rootUser, domainName: domainName, dataBase: newVolume, + serverType: serverType, ); return details; @@ -317,6 +319,7 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { required final User rootUser, required final String domainName, required final ServerVolume dataBase, + required final String serverType, }) async { final Dio client = await getClient(); @@ -336,7 +339,7 @@ class DigitalOceanApi extends ServerProviderApi with VolumeProviderApi { final Map data = { 'name': hostname, - 'server_type': 'cx11', + 'server_type': serverType, 'start_after_create': false, 'image': 'ubuntu-20.04', 'volumes': dbUuid == null ? [dbId] : [dbUuid], diff --git a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart index 0d8e0ab0..5980f9cb 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/hetzner/hetzner.dart @@ -298,6 +298,7 @@ class HetznerApi extends ServerProviderApi with VolumeProviderApi { required final String dnsApiToken, required final User rootUser, required final String domainName, + required final String serverType, }) async { ServerHostingDetails? details; @@ -311,6 +312,7 @@ class HetznerApi extends ServerProviderApi with VolumeProviderApi { rootUser: rootUser, domainName: domainName, dataBase: newVolume, + serverType: serverType, ); return details; @@ -321,6 +323,7 @@ class HetznerApi extends ServerProviderApi with VolumeProviderApi { required final User rootUser, required final String domainName, required final ServerVolume dataBase, + required final String serverType, }) async { final Dio client = await getClient(); @@ -343,7 +346,7 @@ class HetznerApi extends ServerProviderApi with VolumeProviderApi { try { final Map data = { 'name': hostname, - 'server_type': 'cx11', + 'server_type': serverType, 'start_after_create': false, 'image': 'ubuntu-20.04', 'volumes': [dbId], diff --git a/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart b/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart index ffc1d2d9..cd28b46f 100644 --- a/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart +++ b/lib/logic/api_maps/rest_maps/server_providers/server_provider.dart @@ -21,6 +21,7 @@ abstract class ServerProviderApi extends ApiMap { required final String dnsApiToken, required final User rootUser, required final String domainName, + required final String serverType, }); Future createReverseDns({ required final ServerHostingDetails serverDetails, diff --git a/lib/logic/cubit/server_installation/server_installation_repository.dart b/lib/logic/cubit/server_installation/server_installation_repository.dart index 7296d3a3..5b33ef28 100644 --- a/lib/logic/cubit/server_installation/server_installation_repository.dart +++ b/lib/logic/cubit/server_installation/server_installation_repository.dart @@ -16,7 +16,6 @@ import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider_ import 'package:selfprivacy/logic/api_maps/rest_maps/dns_providers/dns_provider_factory.dart'; import 'package:selfprivacy/logic/api_maps/rest_maps/server.dart'; import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider.dart'; -import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider_api_settings.dart'; import 'package:selfprivacy/logic/api_maps/rest_maps/server_providers/server_provider_factory.dart'; import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart'; import 'package:selfprivacy/logic/models/hive/backblaze_credential.dart'; @@ -247,6 +246,7 @@ class ServerInstallationRepository { dnsApiToken: cloudFlareKey, rootUser: rootUser, domainName: domainName, + serverType: getIt().serverType!, ); if (serverDetails == null) { @@ -277,6 +277,7 @@ class ServerInstallationRepository { dnsApiToken: cloudFlareKey, rootUser: rootUser, domainName: domainName, + serverType: getIt().serverType!, ); } catch (e) { print(e); @@ -314,6 +315,7 @@ class ServerInstallationRepository { dnsApiToken: cloudFlareKey, rootUser: rootUser, domainName: domainName, + serverType: getIt().serverType!, ); } catch (e) { print(e); diff --git a/lib/ui/pages/setup/initializing/server_type_picker.dart b/lib/ui/pages/setup/initializing/server_type_picker.dart index a913f240..7a56ac2e 100644 --- a/lib/ui/pages/setup/initializing/server_type_picker.dart +++ b/lib/ui/pages/setup/initializing/server_type_picker.dart @@ -154,7 +154,8 @@ class SelectTypePage extends StatelessWidget { Text('disk: $type.disk.gibibyte'), const SizedBox(height: 8), Text( - 'price: $type.price.value $type.price.currency'), + 'price: $type.price.value $type.price.currency', + ), ], ), ],