Skip to content

Commit

Permalink
Merge pull request #166 from rtCamp/patch/fix-fm-headers
Browse files Browse the repository at this point in the history
Fix `fm_headers.conf` not found
  • Loading branch information
Xieyt committed Apr 29, 2024
2 parents 9503462 + 58c086a commit 8455ca4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
15 changes: 11 additions & 4 deletions frappe_manager/services_manager/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,17 @@ def init(self):

self.compose_project = ComposeProject(compose_file_manager=compose_file_manager)
self.proxy_manager: NginxProxyManager = NginxProxyManager('global-nginx-proxy', self.compose_project)

self.fm_headers_path: Path = self.proxy_manager.dirs.confd.host / 'fm_headers.conf'
self.set_frappe_headers_conf()


template_path: Path = get_template_path('fm_headers.conf.tmpl')
template = Template(template_path.read_text())
output = template.render(current_version=f'v{get_current_fm_version()}')
self.fm_headers_path.write_text(output)
def set_frappe_headers_conf(self):
if self.fm_headers_path.parent.exists():
template_path: Path = get_template_path('fm_headers.conf.tmpl')
template = Template(template_path.read_text())
output = template.render(current_version=f'v{get_current_fm_version()}')
self.fm_headers_path.write_text(output)

def set_typer_context(self, ctx: typer.Context):
"""
Expand Down Expand Up @@ -191,6 +196,8 @@ def create(self, backup: bool = False, clean_install: bool = True):
docker=self.compose_project.docker,
)

self.set_frappe_headers_conf()

self.compose_project.compose_file_manager.set_secret_file_path('db_password', str(db_password_path.absolute()))
self.compose_project.compose_file_manager.set_secret_file_path(
'db_root_password', str(db_root_password_path.absolute())
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "frappe-manager"
version = "0.13.1"
version = "0.13.2"
license = "MIT"
repository = "https://github.com/rtcamp/frappe-manager"
description = "A CLI tool based on Docker Compose to easily manage Frappe based projects. As of now, only suitable for development in local machines running on Mac and Linux based OS."
Expand Down

0 comments on commit 8455ca4

Please sign in to comment.