diff --git a/scripts/StagingUserAssignation.py b/scripts/StagingUserAssignation.py index bcdd2e5..5504a89 100644 --- a/scripts/StagingUserAssignation.py +++ b/scripts/StagingUserAssignation.py @@ -14,14 +14,14 @@ parser.add_argument("-force", action=argparse.BooleanOptionalAction) args = parser.parse_args() settingsDefault = { - "airwatchServer":"https://airwatchServer/", + "airwatchServer":"https://airwatchServer", "airwatchAPIKey":"APIKEY", "airwatchAuthMethod":"CMSURL", "airwatchCertPath":"/path/to/cert", "airwatchCertPass":"certPassword", "airwatchAPIUser":"UserAPI", "airwatchAPIPassword":"PasswordUserAPI", - "glpiServer":"http://127.0.0.1/glpi/", + "glpiServer":"http://127.0.0.1/glpi", "glpiAppToken":"GLPIAppToken", "glpiUserToken":"GLPIUserToken", "stagingUser":"staging-pr", @@ -173,7 +173,7 @@ GLPIHeaders = { } # Adresse de recherche des appareils présents dans ordinateurs sur GLPI -GLPIAPISearchComputer = 'apirest.php/search/computer?' +GLPIAPISearchComputer = '/apirest.php/search/computer?' for device in devices: if(device["EnrollmentStatus"] != 'Enrolled'): diff --git a/scripts/settings.json b/scripts/settings.json index 72d9d90..dbc0ea8 100644 --- a/scripts/settings.json +++ b/scripts/settings.json @@ -1,12 +1,12 @@ { - "airwatchServer": "https://airwatchServer/", + "airwatchServer": "https://airwatchServer", "airwatchAPIKey": "APIKEY", "airwatchAuthMethod": "CMSURL", "airwatchCertPath": "/path/to/cert", "airwatchCertPass": "certPassword", "airwatchAPIUser": "UserAPI", "airwatchAPIPassword": "PasswordUserAPI", - "glpiServer": "http://127.0.0.1/glpi/", + "glpiServer": "http://127.0.0.1/glpi", "glpiAppToken": "GLPIAppToken", "glpiUserToken": "GLPIUserToken", "stagingUser": "staging-pr", diff --git a/scripts/syncGLPI.py b/scripts/syncGLPI.py index 8e0a63a..fe71337 100644 --- a/scripts/syncGLPI.py +++ b/scripts/syncGLPI.py @@ -18,14 +18,14 @@ parser.add_argument("-force", action=argparse.BooleanOptionalAction) args = parser.parse_args() settingsDefault = { - "airwatchServer":"https://airwatchServer/", + "airwatchServer":"https://airwatchServer", "airwatchAPIKey":"APIKEY", "airwatchAuthMethod":"CMSURL", "airwatchCertPath":"/path/to/cert", "airwatchCertPass":"certPassword", "airwatchAPIUser":"UserAPI", "airwatchAPIPassword":"PasswordUserAPI", - "glpiServer":"http://127.0.0.1/glpi/", + "glpiServer":"http://127.0.0.1/glpi", "glpiAppToken":"GLPIAppToken", "glpiUserToken":"GLPIUserToken", "stagingUser":"staging-pr", @@ -246,7 +246,7 @@ GLPIHeaders = { } # Adresse de recherche des appareils présents dans ordinateurs sur GLPI -GLPIAPISearchComputer = 'apirest.php/search/computer?' +GLPIAPISearchComputer = '/apirest.php/search/computer?' platforms = { 2:"Apple iOS",