Slightly improve API for ogrepo usability

ogrepository-fixes
Vadim vtroshchinskiy 2025-06-16 12:02:25 +02:00
parent 83dba76e43
commit abbc57d4fa
1 changed files with 6 additions and 3 deletions

View File

@ -219,7 +219,7 @@ class OpengnsysGitInstaller:
self.forgejo_user = "oggit"
self.forgejo_password = "opengnsys"
self.forgejo_organization = "opengnsys"
self.forgejo_port = 3000
self.forgejo_port = 3100
self.forgejo_bin_path = os.path.join(self.ogrepository_base_path, "bin")
self.forgejo_exe = os.path.join(self.forgejo_bin_path, "forgejo")
@ -431,11 +431,13 @@ class OpengnsysGitInstaller:
name = os.path.basename(squashfs_file)
keys = installer.extract_ssh_keys_from_squashfs(oglive_num = oglive_num, squashfs_file=squashfs_file)
keys = self.extract_ssh_keys_from_squashfs(oglive_num = oglive_num, squashfs_file=squashfs_file)
retvals = []
for k in keys:
timestamp = '{:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now())
installer.add_forgejo_sshkey(k, f"Key for {name} ({timestamp})")
retvals = retvals + [self.add_forgejo_sshkey(k, f"Key for {name} ({timestamp})")]
return retvals
def extract_ssh_keys_from_squashfs(self, oglive_num = None, squashfs_file = None):
@ -1014,6 +1016,7 @@ class OpengnsysGitInstaller:
)
self.__logger.info("Request status was %i, content %s", r.status_code, r.content)
return r.status_code, r.content.decode('utf-8')
def add_forgejo_organization(self, pubkey, description = ""):
token = ""