Merge pull request #80 from plesk/CPCLOUD-4360-no-agent-360-token-ini-created-during-installing-on-windows-server

[CPCLOUD-4360] No agent360-token.ini created during installing on Windows server

Author: vfuse

agent360/agent360.py

@@ -54,6 +54,7 @@
 
 __version__ = '1.3.2'
 __FILEABSDIRNAME__ = os.path.dirname(os.path.abspath(__file__))
+sslContext = ssl.create_default_context(cafile=certifi.where())
 
 ini_files = (
     os.path.join('/etc', 'agent360.ini'),
@@ -141,8 +142,9 @@ def hello(proto='https'):
                     'unique_id': unique_id,
                     'tags': tags,
                     'domains': domains,
-            }).encode("utf-8")
-           ).read().decode()
+            }).encode("utf-8"),
+            context=sslContext
+        ).read().decode()
 
     if len(server_id) == 24:
         print('Got server_id: %s' % server_id)
@@ -574,12 +576,10 @@ def _data(self):
                     else:
 
                         try:
-                            ctx = ssl.create_default_context(cafile=certifi.where())
-
                             if sys.version_info >= (3,):
-                                connection = http.client.HTTPSConnection(api_host, context=ctx, timeout=15)
+                                connection = http.client.HTTPSConnection(api_host, context=sslContext, timeout=15)
                             else:
-                                connection = httplib.HTTPSConnection(api_host, context=ctx, timeout=15)
+                                connection = httplib.HTTPSConnection(api_host, context=sslContext, timeout=15)
 
                             # Trying to send cached collections if any
                             if cached_collections:

windows/setup.iss

@@ -23,7 +23,7 @@ SolidCompression=yes
 WizardStyle=modern
 OutputDir=dist
 DisableWelcomePage=no
-ArchitecturesInstallIn64BitMode=x64
+ArchitecturesInstallIn64BitMode=x64os
 UsedUserAreasWarning=no
 SetupLogging=yes
 
@@ -140,18 +140,6 @@ begin
   end;
 end;
 
-procedure OpenBrowser(Url: string);
-var
-  ErrorCode: Integer;
-begin
-  ShellExec('open', Url, '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode);
-end;
-
-procedure LinkClick(Sender: TObject);
-begin
-  OpenBrowser('https://www.example.com/');
-end;
-
 procedure AddCustomQueryPage();
 var
   RichView: TRichEditViewer;