diff --git a/installer/opengnsys_git_installer.py b/installer/opengnsys_git_installer.py index 45a64af..996d3b1 100755 --- a/installer/opengnsys_git_installer.py +++ b/installer/opengnsys_git_installer.py @@ -780,6 +780,30 @@ class OpengnsysGitInstaller: subprocess.run(["systemctl", "restart", "gitapi"], check=True) + def _get_forgejo_data(self): + conf_path = os.path.join(self.forgejo_conf_dir_path, "app.ini") + + data = { + "forgejo_user" : self.ssh_user, + "forgejo_group" : self.ssh_group, + "forgejo_port" : str(self.forgejo_port), + "forgejo_bin" : self.forgejo_exe, + "forgejo_app_ini" : conf_path, + "forgejo_work_path" : self.forgejo_work_dir_path, + "forgejo_data_path" : self.forgejo_data_dir_path, + "forgejo_db_path" : self.forgejo_db_path, + "forgejo_repository_root" : self.git_dir_path, + "forgejo_lfs_path" : self.lfs_dir_path, + "forgejo_log_path" : self.forgejo_log_dir_path, + "forgejo_hostname" : self._runcmd("hostname"), + "forgejo_lfs_jwt_secret" : self._runcmd([self.forgejo_exe,"generate", "secret", "LFS_JWT_SECRET"]), + "forgejo_jwt_secret" : self._runcmd([self.forgejo_exe,"generate", "secret", "JWT_SECRET"]), + "forgejo_internal_token" : self._runcmd([self.forgejo_exe,"generate", "secret", "INTERNAL_TOKEN"]), + "forgejo_secret_key" : self._runcmd([self.forgejo_exe,"generate", "secret", "SECRET_KEY"]) + } + + return data + def install_forgejo(self, download=True): self.__logger.info("Installing Forgejo version %s", FORGEJO_VERSION) @@ -828,24 +852,7 @@ class OpengnsysGitInstaller: os.chown(self.forgejo_db_dir_path, self.ssh_uid, self.ssh_gid) os.chown(self.forgejo_log_dir_path, self.ssh_uid, self.ssh_gid) - data = { - "forgejo_user" : self.ssh_user, - "forgejo_group" : self.ssh_group, - "forgejo_port" : str(self.forgejo_port), - "forgejo_bin" : self.forgejo_exe, - "forgejo_app_ini" : conf_path, - "forgejo_work_path" : self.forgejo_work_dir_path, - "forgejo_data_path" : self.forgejo_data_dir_path, - "forgejo_db_path" : self.forgejo_db_path, - "forgejo_repository_root" : self.git_dir_path, - "forgejo_lfs_path" : self.lfs_dir_path, - "forgejo_log_path" : self.forgejo_log_dir_path, - "forgejo_hostname" : self._runcmd("hostname"), - "forgejo_lfs_jwt_secret" : self._runcmd([self.forgejo_exe,"generate", "secret", "LFS_JWT_SECRET"]), - "forgejo_jwt_secret" : self._runcmd([self.forgejo_exe,"generate", "secret", "JWT_SECRET"]), - "forgejo_internal_token" : self._runcmd([self.forgejo_exe,"generate", "secret", "INTERNAL_TOKEN"]), - "forgejo_secret_key" : self._runcmd([self.forgejo_exe,"generate", "secret", "SECRET_KEY"]) - } + data = self._get_forgejo_data() self._install_template(os.path.join(self.script_path, "forgejo-app.ini"), conf_path, data) self._install_template(os.path.join(self.script_path, "forgejo.service"), "/etc/systemd/system/opengnsys-forgejo.service", data) @@ -884,9 +891,10 @@ class OpengnsysGitInstaller: with open(os.path.join(self.base_path, "etc", "ogGitApiToken.cfg"), "w+", encoding='utf-8') as token_file: token_file.write(token) - # def configure_forgejo(self): - - + def configure_forgejo(self): + data = self._get_forgejo_data() + conf_path = os.path.join(self.forgejo_conf_dir_path, "app.ini") + self._install_template(os.path.join(self.script_path, "forgejo-app.ini"), conf_path, data) def add_forgejo_repo(self, repository_name, description = ""): token = ""