diff --git a/lib/logic/api_maps/hetzner.dart b/lib/logic/api_maps/hetzner.dart index 432b26c0..802f8333 100644 --- a/lib/logic/api_maps/hetzner.dart +++ b/lib/logic/api_maps/hetzner.dart @@ -40,11 +40,13 @@ class HetznerApi extends ApiMap { } Future createServer({ + @required String cloudFlareKey, @required User rootUser, @required String domainName, }) async { var data = jsonDecode( - '''{"name":"selfprivacy-server","server_type":"cx11","start_after_create":false,"image":"ubuntu-20.04", "volumes":[],"networks":[],"user_data":"#cloud-config\\nruncmd:\\n- curl https://git.selfprivacy.org/ilchub/selfprivacy-nixos-infect/raw/branch/master/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-20.09 DOMAIN=$domainName USER=${rootUser.login} PASSWORD=${rootUser.password} HASHED_PASSWORD=${rootUser.hashPassword} bash 2>&1 | tee /tmp/infect.log","labels":{},"automount":false}'''); + '''{"name":"selfprivacy-server","server_type":"cx11","start_after_create":false,"image":"ubuntu-20.04", "volumes":[],"networks":[],"user_data":"#cloud-config\\nruncmd:\\n- curl https://git.selfprivacy.org/ilchub/selfprivacy-nixos-infect/raw/branch/master/nixos-infect | PROVIDER=hetzner NIX_CHANNEL=nixos-20.09 DOMAIN=$domainName LUSER=${rootUser.login} PASSWORD=${rootUser.password} HASHED_PASSWORD=${rootUser.hashPassword} CF_TOKEN=$cloudFlareKey bash 2>&1 | tee /tmp/infect.log","labels":{},"automount":false}''', + ); Response response = await loggedClient.post( rootAddress, diff --git a/lib/logic/cubit/app_config/app_config_cubit.dart b/lib/logic/cubit/app_config/app_config_cubit.dart index 9def221a..20948829 100644 --- a/lib/logic/cubit/app_config/app_config_cubit.dart +++ b/lib/logic/cubit/app_config/app_config_cubit.dart @@ -113,6 +113,7 @@ class AppConfigCubit extends Cubit { state.hetznerKey, state.rootUser, state.cloudFlareDomain.domainName, + state.cloudFlareKey, ); await repository.createDnsRecords( diff --git a/lib/logic/cubit/app_config/app_config_repository.dart b/lib/logic/cubit/app_config/app_config_repository.dart index 240090d3..d9beba3e 100644 --- a/lib/logic/cubit/app_config/app_config_repository.dart +++ b/lib/logic/cubit/app_config/app_config_repository.dart @@ -108,9 +108,11 @@ class AppConfigRepository { String hetznerKey, User rootUser, String domainName, + String cloudFlareKey ) async { var hetznerApi = HetznerApi(hetznerKey); var serverDetails = await hetznerApi.createServer( + cloudFlareKey: cloudFlareKey, rootUser: rootUser, domainName: domainName, );