Skip to content

Commit

Permalink
Merge pull request #161 from jedie/update-yunohost
Browse files Browse the repository at this point in the history
Update YunoHost template
  • Loading branch information
jedie authored Dec 23, 2024
2 parents 7b8d152 + 042eaef commit b3d9208
Show file tree
Hide file tree
Showing 17 changed files with 2,098 additions and 1,664 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ Usage: ./dev-cli.py [OPTIONS] COMMAND [ARGS]...
[comment]: <> (✂✂✂ auto generated history start ✂✂✂)

* [v0.5.0](https://github.com/jedie/cookiecutter_templates/compare/v0.3.0...v0.5.0)
* 2024-12-23 - Update YunoHost template
* 2024-12-03 - Use new cli_base
* 2024-12-03 - Remove tyro work-a-round
* 2024-11-21 - Replace click by tyro in uv-python
Expand All @@ -246,7 +247,6 @@ Usage: ./dev-cli.py [OPTIONS] COMMAND [ARGS]...
* 2024-09-25 - Updates for "piptools-python" template:
* 2024-09-22 - Move pip-compile settings into pyproject.toml and add piwheels hashes
* 2024-09-09 - Update YunoHost package: reuse existing venv and use pip-sync
* 2024-09-07 - Update YunoHost template
* 2024-09-05 - update manage-django-project
* 2024-09-05 - Update template requirements and some min. Python specification
* 2024-09-05 - "bin/python" -> "bin/python3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.12', '3.11']
python-version: ['3.13', '3.12', '3.11']
steps:
- name: Checkout
run: |
Expand Down Expand Up @@ -45,9 +45,10 @@ jobs:
run: |
./dev-cli.py --help
- name: 'Run pip-audit'
run: |
./dev-cli.py pip-audit
# TODO: Activate after switch to uv:
# - name: 'Run pip-audit'
# run: |
# ./dev-cli.py pip-audit

- name: 'Run tests with Python v${{ matrix.python-version }}'
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ location __PATH__/ {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Scheme $scheme;

# Sets `HTTP_YNH_USER` used in django_yunohost_integration
proxy_set_header Ynh-User $http_ynh_user;

proxy_read_timeout 30;
proxy_send_timeout 30;
proxy_connect_timeout 30;
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@
# Set log file to e.g.: /var/log/$app/$app.log
LOGGING['handlers']['log_file']['filename'] = str(LOG_FILE_PATH)

LOGGING['loggers']['django_yunohost_integration'] = { # TODO: Move to django_yunohost_integration base settings
'handlers': ['syslog', 'log_file', 'mail_admins'],
'propagate': False,
}

# Example how to add logging to own app:
LOGGING['loggers']['django_example'] = {
'handlers': ['syslog', 'log_file', 'mail_admins'],
Expand Down
Loading

0 comments on commit b3d9208

Please sign in to comment.