Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Bug report
about: Open a bug report
title: "[bug] "
labels: bug
assignees: ''

assignees: ""
---

**Describe the bug**
A clear and concise description of the bug or unexpected behavior.

**Steps To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -24,6 +24,7 @@ A clear and concise description of what you expected to happen.
If applicable, add screenshots to help explain your problem.

**System Informatioon:**
- OS: [e.g. Ubuntu 24.04 LTS]
- Docker version: [e.g. Docker version 27.0.3, build 7d4bcd8]
- Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126]

- OS: [e.g. Ubuntu 24.04 LTS]
- Docker version: [e.g. Docker version 27.0.3, build 7d4bcd8]
- Browser and Browser Version (if applicable): [e.g. Chromium v126.0.6478.126]
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Feature request
about: Suggest an idea for this project
title: "[feature] "
labels: enhancement
assignees: ''

assignees: ""
---

**Is your feature request related to a problem? Please describe.**
Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Question
about: Please use the Discussion Forum to ask questions
title: "[question] "
labels: question
assignees: ''

assignees: ""
---

Please use the [Discussion Forum](https://github.com/orgs/openwisp/discussions) to ask questions.
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ services:
networks:
default:
aliases:
- dashboard.internal
- api.internal
- dashboard.internal
- api.internal
ports:
- "${NGINX_PORT:-80}:80"
- "${NGINX_SSL_PORT:-443}:443"
Expand Down
1 change: 1 addition & 0 deletions images/common/init_command.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ if [ "$MODULE_NAME" = 'dashboard' ]; then
start_uwsgi
elif [ "$MODULE_NAME" = 'postfix' ]; then
postfix_config
postfix set-permissions
postfix start
rsyslogd -n
elif [ "$MODULE_NAME" = 'freeradius' ]; then
Expand Down
8 changes: 7 additions & 1 deletion images/common/openwisp/asgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
get_routes as get_controller_routes,
)

routes = get_controller_routes()
routes = []
routes.extend(get_controller_routes())

if env_bool(os.environ.get("USE_OPENWISP_TOPOLOGY")):
from openwisp_network_topology.routing import ( # noqa: E402
Expand All @@ -28,6 +29,11 @@

routes.extend(network_topology_routes)

if env_bool(os.environ["USE_OPENWISP_RADIUS"]):
from openwisp_radius.routing import websocket_urlpatterns as radius_routes

routes.extend(radius_routes)

application = ProtocolTypeRouter(
{
"http": django_asgi_app,
Expand Down
14 changes: 0 additions & 14 deletions images/common/openwisp/routing.py

This file was deleted.

2 changes: 1 addition & 1 deletion images/openwisp_api/module_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"openwisp_network_topology",
# openwisp-firmware-upgrader
"openwisp_firmware_upgrader",
# openwisp radius
# openwisp-radius
"dj_rest_auth",
"dj_rest_auth.registration",
"openwisp_radius",
Expand Down
13 changes: 8 additions & 5 deletions images/openwisp_base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,18 @@ RUN apt-get update && \

RUN useradd --system --password '' --create-home --shell /bin/bash \
--gid root --uid 1001 openwisp
RUN mkdir /home/openwisp/.ssh && \
mkdir -p /tmp && chmod 1777 /tmp
RUN chown -R openwisp:root /home/openwisp/
USER openwisp:root

FROM system AS openwisp_python

ENV PATH="${PATH}:/home/openwisp/.local/bin"
ENV PYTHONPATH=/home/openwisp/.local/lib/python3.10/site-packages

RUN pip install --no-cache-dir --user --upgrade pip~=24.1.2 setuptools~=70.3.0 wheel~=0.43.0

# hadolint ignore=DL3013
RUN pip install --no-cache-dir --user --upgrade pip setuptools wheel
ARG OPENWISP_MONITORING_SOURCE="https://github.com/openwisp/openwisp-monitoring/tarball/1.2"
# hadolint ignore=DL3013
RUN pip install --no-cache-dir --user --upgrade ${OPENWISP_MONITORING_SOURCE}
Expand Down Expand Up @@ -88,9 +92,8 @@ COPY --chown=openwisp:root ./common/ /opt/openwisp/
RUN mkdir /opt/openwisp/static && \
mkdir /opt/openwisp/media && \
mkdir /opt/openwisp/private && \
mkdir /opt/openwisp/logs && \
mkdir /home/openwisp/.ssh && \
chown -R openwisp:root /opt/openwisp && \
mkdir /opt/openwisp/logs
RUN chown -R openwisp:root /opt/openwisp && \
chown -R openwisp:root /home/openwisp/.ssh
# Maintain backward compatibility with code written for ansible-openwisp2
RUN ln -s /opt/openwisp/openwisp /opt/openwisp/openwisp2
Expand Down
160 changes: 80 additions & 80 deletions images/openwisp_dashboard/openvpn.json
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
{
"openvpn": [
{
"server": "10.8.0.0 255.255.255.0",
"name": "default",
"mode": "server",
"proto": "udp",
"port": 1194,
"dev_type": "tun",
"dev": "tun0",
"local": "",
"comp_lzo": "no",
"auth": "SHA1",
"cipher": "none",
"engine": "",
"ca": "ca.pem",
"cert": "cert.pem",
"key": "key.pem",
"pkcs12": "",
"ns_cert_type": "",
"mtu_disc": "no",
"mtu_test": false,
"fragment": 0,
"mssfix": 1450,
"keepalive": "10 120",
"persist_tun": true,
"persist_key": true,
"tun_ipv6": false,
"up": "",
"up_delay": 0,
"down": "",
"script_security": 1,
"user": "nobody",
"group": "nogroup",
"mute": 0,
"status": "/var/log/tun0.status",
"status_version": 1,
"mute_replay_warnings": false,
"secret": "",
"reneg_sec": 0,
"tls_timeout": 2,
"tls_cipher": "",
"remote_cert_tls": "",
"float": false,
"fast_io": true,
"log": "",
"verb": 3,
"topology": "p2p",
"tls_server": true,
"dh": "dh.pem",
"crl_verify": "revoked.crl",
"duplicate_cn": false,
"client_to_client": false,
"client_cert_not_required": false,
"username_as_common_name": false,
"auth_user_pass_verify": "",
"tls_auth": ""
}
],
"files": [
{
"path": "ca.pem",
"mode": "0644",
"contents": "{{ ca }}"
},
{
"path": "cert.pem",
"mode": "0644",
"contents": "{{ cert }}"
},
{
"path": "key.pem",
"mode": "0644",
"contents": "{{ key }}"
},
{
"path": "dh.pem",
"mode": "0644",
"contents": "{{ dh }}"
}
]
"openvpn": [
{
"server": "10.8.0.0 255.255.255.0",
"name": "default",
"mode": "server",
"proto": "udp",
"port": 1194,
"dev_type": "tun",
"dev": "tun0",
"local": "",
"comp_lzo": "no",
"auth": "SHA1",
"cipher": "none",
"engine": "",
"ca": "ca.pem",
"cert": "cert.pem",
"key": "key.pem",
"pkcs12": "",
"ns_cert_type": "",
"mtu_disc": "no",
"mtu_test": false,
"fragment": 0,
"mssfix": 1450,
"keepalive": "10 120",
"persist_tun": true,
"persist_key": true,
"tun_ipv6": false,
"up": "",
"up_delay": 0,
"down": "",
"script_security": 1,
"user": "nobody",
"group": "nogroup",
"mute": 0,
"status": "/var/log/tun0.status",
"status_version": 1,
"mute_replay_warnings": false,
"secret": "",
"reneg_sec": 0,
"tls_timeout": 2,
"tls_cipher": "",
"remote_cert_tls": "",
"float": false,
"fast_io": true,
"log": "",
"verb": 3,
"topology": "p2p",
"tls_server": true,
"dh": "dh.pem",
"crl_verify": "revoked.crl",
"duplicate_cn": false,
"client_to_client": false,
"client_cert_not_required": false,
"username_as_common_name": false,
"auth_user_pass_verify": "",
"tls_auth": ""
}
],
"files": [
{
"path": "ca.pem",
"mode": "0644",
"contents": "{{ ca }}"
},
{
"path": "cert.pem",
"mode": "0644",
"contents": "{{ cert }}"
},
{
"path": "key.pem",
"mode": "0644",
"contents": "{{ key }}"
},
{
"path": "dh.pem",
"mode": "0644",
"contents": "{{ dh }}"
}
]
}
7 changes: 6 additions & 1 deletion images/openwisp_websocket/module_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@
"openwisp_ipam",
# openwisp-network-topology
"openwisp_network_topology",
"openwisp_utils.admin_theme",
# openwisp-radius
"dj_rest_auth",
"dj_rest_auth.registration",
"openwisp_radius",
# admin
"openwisp_utils.admin_theme",
"django.contrib.admin",
"django.forms",
# other dependencies
Expand All @@ -35,6 +39,7 @@
# rest framework
"rest_framework",
"rest_framework_gis",
"rest_framework.authtoken",
"django_filters",
# other packages
"private_storage",
Expand Down
22 changes: 11 additions & 11 deletions tests/config.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"driver": "chromium",
"headless": true,
"app_url": "https://dashboard.openwisp.org",
"api_url": "https://api.openwisp.org",
"load_init_data": true,
"logs": false,
"logs_file": "/tmp/odocker.log",
"username": "admin",
"password": "admin",
"services_max_retries": 25,
"services_delay_retries": 5
"driver": "chromium",
"headless": true,
"app_url": "https://dashboard.openwisp.org",
"api_url": "https://api.openwisp.org",
"load_init_data": true,
"logs": false,
"logs_file": "/tmp/odocker.log",
"username": "admin",
"password": "admin",
"services_max_retries": 25,
"services_delay_retries": 5
}
Loading