From 73c8d2443b0a4ed9404f017818e93dacba70d6b7 Mon Sep 17 00:00:00 2001
From: Maciej Sobkowiak <masobkowiak@gmail.com>
Date: Tue, 4 Jan 2022 22:22:32 +0100
Subject: [PATCH] .

---
 1 hetzner/webservice.yml                    |  11 --------
 {1 hetzner => 4_1_hetzner}/.gitignore       |   0
 {1 hetzner => 4_1_hetzner}/config_base.json |   0
 {1 hetzner => 4_1_hetzner}/deploy.py        |  28 ++++----------------
 4_1_hetzner/requirements.txt                | Bin 0 -> 326 bytes
 4_1_hetzner/webservice.yml                  |   6 +++++
 1 hetzner/webservice => webservice          | Bin
 7 files changed, 11 insertions(+), 34 deletions(-)
 delete mode 100644 1 hetzner/webservice.yml
 rename {1 hetzner => 4_1_hetzner}/.gitignore (100%)
 rename {1 hetzner => 4_1_hetzner}/config_base.json (100%)
 rename {1 hetzner => 4_1_hetzner}/deploy.py (72%)
 create mode 100644 4_1_hetzner/requirements.txt
 create mode 100644 4_1_hetzner/webservice.yml
 rename 1 hetzner/webservice => webservice (100%)

diff --git a/1 hetzner/webservice.yml b/1 hetzner/webservice.yml
deleted file mode 100644
index 1ceb4ea..0000000
--- a/1 hetzner/webservice.yml	
+++ /dev/null
@@ -1,11 +0,0 @@
-#cloud-config
-write_files:
-  - content: |
-      curl -fsSL https://code-server.dev/install.sh > /root/install.sh
-    permissions: "755"
-    owner: root:root
-    path: /root/install.sh
-
-runcmd:
-  - bash /root/install.sh
-  - code-server --bind-addr 0.0.0.0:8080
diff --git a/1 hetzner/.gitignore b/4_1_hetzner/.gitignore
similarity index 100%
rename from 1 hetzner/.gitignore
rename to 4_1_hetzner/.gitignore
diff --git a/1 hetzner/config_base.json b/4_1_hetzner/config_base.json
similarity index 100%
rename from 1 hetzner/config_base.json
rename to 4_1_hetzner/config_base.json
diff --git a/1 hetzner/deploy.py b/4_1_hetzner/deploy.py
similarity index 72%
rename from 1 hetzner/deploy.py
rename to 4_1_hetzner/deploy.py
index 1cfe094..5d30804 100644
--- a/1 hetzner/deploy.py	
+++ b/4_1_hetzner/deploy.py
@@ -1,7 +1,6 @@
 import json
 import time
 import sys
-import paramiko
 import requests
 from hcloud import Client
 from hcloud.networks.domain import NetworkSubnet
@@ -39,18 +38,18 @@ class Client_MS:
             return self.client.ssh_keys.create(name=self.config["ssh_name"], public_key=self.config["ssh_public"])
 
     def create_vscode_server(self):
-        with open("vscode.yml", "r") as f:
+        with open("webservice.yml", "r") as f:
             vs = f.read()
 
-        if(self.client.servers.get_by_name(self.config["vs-code-name"])):
+        if(self.client.servers.get_by_name(self.config["server-name"])):
             print("Server exists.")
             self.vscode = self.client.servers.get_by_name(
-                self.config["vs-code-name"])
+                self.config["server-name"])
             return self.vscode
         else:
             print("Creating server.")
             vscode = self.client.servers.create(
-                name=self.config["vs-code-name"],
+                name=self.config["server-name"],
                 server_type=ServerType(self.config["server-type"]),
                 image=Image(name=self.config["server-image"]),
                 ssh_keys=[self.ssh_key],
@@ -60,23 +59,6 @@ class Client_MS:
             self.vscode = vscode.server
             return vscode.server
 
-    def get_password(self):
-        while(True):
-            try:
-                print("Status: Setting up...", end='\r')
-                requests.get(f'http://{self.vscode.data_model.public_net.ipv4.ip}:8080')
-                break
-            except:
-                time.sleep(1)
-        print("Status: Running.        ", end='\n')
-        ssh = paramiko.SSHClient()
-        k = paramiko.RSAKey.from_private_key_file(self.config["ssh_private"])
-
-        ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-        ssh.connect( hostname=self.vscode.data_model.public_net.ipv4.ip, username="root", pkey=k, timeout=1000)
-        stdin, stdout, stderr = ssh.exec_command('cat < ~/.config/code-server/config.yaml')
-        print(f'VS Code password: {stdout.readlines()[2].split()[1]}\n')
-    
     def print_info(self):
         print("----- Server info -----")
         print(
@@ -95,7 +77,7 @@ if __name__ == '__main__':
     else:
         c = Client_MS(sys.argv[1])
         c.print_info()
-        c.get_password()
+        # c.get_password()
         try:
             for remaining in range(60, 0, -1):
                 sys.stdout.write("\r")
diff --git a/4_1_hetzner/requirements.txt b/4_1_hetzner/requirements.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a87cc22e32c87883f8052d75db3103ba943dc525
GIT binary patch
literal 326
zcmZ9H?FxcW5Jcy9(4!=NK=r4GDZQd#_Td$(hp*1Ah!L`aJ3D8_&%0F6T~V!S=D?FH
zWilm9%6qT1Rw~u#$mPI&)JDB7e4W{K_+Cz#+{urt*2wk9WpK9fGKdKYMs47BkVaLm
zPpMn<)b*BqPlk~TwuNu6dO~gR^)#u_BYaD0q0KFp6idIM2iiwwzR0yC4R{}}{CBYS
Qo&V*DeDm7H<lT9nFXrqo!T<mO

literal 0
HcmV?d00001

diff --git a/4_1_hetzner/webservice.yml b/4_1_hetzner/webservice.yml
new file mode 100644
index 0000000..0f1e480
--- /dev/null
+++ b/4_1_hetzner/webservice.yml
@@ -0,0 +1,6 @@
+#cloud-config
+runcmd:
+  - cd /home
+  - git clone https://git.wmi.amu.edu.pl/s434784/04_Public_cloud 
+  - chmod -x /04_Public_cloud/webservice
+  - bash /home/04_Public_cloud/webservice
diff --git a/1 hetzner/webservice b/webservice
similarity index 100%
rename from 1 hetzner/webservice
rename to webservice