Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #735 from bunkerity/dev

Browse source 
Merge branch "dev" into branch "staging"
This commit is contained in:
Théophile Diot 2023-10-26 11:19:29 +02:00 committed by GitHub
commit d73a5d0f45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
106 changed files with 196 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/push-packagecloud.yml vendored
View file

@ -42,7 +42,7 @@ jobs:
- name: Check out repository code
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Install ruby
uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011 # v1.157.0
uses: ruby/setup-ruby@cd48c8e22733480b66887b42bfeb6c0b88ea1a56 # v1.158.0
with:
ruby-version: "3.0"
- name: Install packagecloud

2
CHANGELOG.md
View file

@ -19,6 +19,8 @@
- [MISC] Add HTML sanitization when injecting code in pages in the UI
- [MISC] Optimize the way the UI handles services creation and edition
- [MISC] Optimize certbot renew script to renew all domains in one command
- [MISC] Use capability instead of sudo in Linux
- [SECURITY] Init work on OpenSSF best practices
## v1.5.2 - 2023/09/10

4
README.md
View file

@ -12,8 +12,8 @@
<br />
<img src="https://img.shields.io/github/issues/bunkerity/bunkerweb">
<img src="https://img.shields.io/github/issues-pr/bunkerity/bunkerweb">
<a href="https://securityscorecards.dev/viewer/?uri=github.com/bunkerity/bunkerweb">
<img src="https://api.securityscorecards.dev/projects/github.com/bunkerity/bunkerweb/badge" />
<a href="https://www.bestpractices.dev/projects/8001">
<img src="https://www.bestpractices.dev/projects/8001/badge">
</a>
</p>

8
docs/integrations.md
View file

@ -69,7 +69,7 @@ services:
mybunker:
image: bunkerity/bunkerweb:1.5.3
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- MY_SETTING=value
- ANOTHER_SETTING=another value
@ -257,7 +257,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
@ -340,7 +340,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
@ -502,7 +502,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

10
docs/quickstart-guide.md
View file

@ -40,7 +40,7 @@ You will find more settings about reverse proxy in the [settings section](settin
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
@ -391,7 +391,7 @@ You will find more settings about reverse proxy in the [settings section](settin
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
- MULTISITE=yes
@ -1156,7 +1156,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett
- 10000:10000 # app1
- 20000:20000 # app2
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=app1.example.com app2.example.com
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24
@ -1820,7 +1820,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=app1.example.com app2.example.com
- MULTISITE=yes
@ -1918,7 +1918,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma
volumes:
- ./www:/var/www/html
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- MULTISITE=yes
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database

6
docs/web-ui.md
View file

@ -74,7 +74,7 @@ Because the web UI is a web application, the recommended installation procedure
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- MULTISITE=yes
@ -194,7 +194,7 @@ Because the web UI is a web application, the recommended installation procedure
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db
@ -351,7 +351,7 @@ Because the web UI is a web application, the recommended installation procedure
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

2
examples/authelia/docker-compose.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
networks:
- bw-universe
- bw-services

2
examples/authentik/docker-compose.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
networks:
- bw-universe
- bw-services

2
examples/behind-reverse-proxy/docker-compose.yml
View file

@ -17,7 +17,7 @@ services:
- USE_REAL_IP=yes
- REAL_IP_FROM=10.10.10.0/24
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- net-proxy
- bw-universe

2
examples/bigbluebutton/docker-compose.yml
View file

@ -42,7 +42,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://10.7.7.253:8080
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
# You have to put this IP address in your docker-compose.yml file
networks:
bbb-net:

2
examples/certbot-dns-cloudflare/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/certbot-dns-digitalocean/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/certbot-dns-google/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/certbot-dns-ovh/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/certbot-dns-route53/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
- app3.example.com_REVERSE_PROXY_URL=/
- app3.example.com_REVERSE_PROXY_HOST=http://app3
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/cors/docker-compose.yml
View file

@ -32,7 +32,7 @@ services:
- app3.example.com_REMOTE_PHP=myapp3
- app3.example.com_REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/docker-configs/docker-compose.yml
View file

@ -47,7 +47,7 @@ services:
}
}
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
networks:
- bw-universe
- bw-services

2
examples/drupal/docker-compose.yml
View file

@ -22,7 +22,7 @@ services:
LIMIT_REQ_URL_1: "/core/install.php"
LIMIT_REQ_RATE_1: "5r/s"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/ghost/docker-compose.yml
View file

@ -18,7 +18,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://myghost:2368
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/gogs/docker-compose.yml
View file

@ -22,7 +22,7 @@ services:
- |
CUSTOM_CONF_MODSEC_CRS_gogs=SecAction "id:900220,phase:1,nolog,pass,t:none,setvar:'tx.allowed_request_content_type=|application/x-www-form-urlencoded| |multipart/form-data| |multipart/related| |text/xml| |application/xml| |application/soap+xml| |application/x-amf| |application/json| |application/cloudevents+json| |application/cloudevents-batch+json| |application/octet-stream| |application/csp-report| |application/xss-auditor-report| |text/plain| |application/x-git-upload-pack-request| |application/x-git-receive-pack-request|'"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/hardened/docker-compose.yml
View file

@ -33,7 +33,7 @@ services:
- REVERSE_PROXY_HOST=http://myapp
- REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/joomla/docker-compose.yml
View file

@ -22,7 +22,7 @@ services:
LIMIT_REQ_URL_2: "/installation/index.php"
LIMIT_REQ_RATE_2: "8r/s"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/load-balancer/docker-compose.yml
View file

@ -25,7 +25,7 @@ services:
server app3:80;
}
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/magento/docker-compose.yml
View file

@ -23,7 +23,7 @@ services:
proxy_buffers 4 512k;
proxy_buffer_size 256k;
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/mattermost/docker-compose.yml
View file

@ -38,7 +38,7 @@ services:
- LIMIT_REQ_URL_3=^/static/
- LIMIT_REQ_RATE_3=10r/s
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/mongo-express/docker-compose.yml
View file

@ -21,7 +21,7 @@ services:
CUSTOM_CONF_MODSEC_mongo-express=
SecRule REQUEST_FILENAME "@rx ^/db" "id:1,ctl:ruleRemoveByTag=attack-generic,ctl:ruleRemoveByTag=attack-protocol,nolog"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/moodle/docker-compose.yml
View file

@ -19,7 +19,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=https://mymoodle:8443
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/nextcloud/docker-compose.yml
View file

@ -48,7 +48,7 @@ services:
CUSTOM_CONF_MODSEC_nextcloud=
SecRule REQUEST_FILENAME "@rx ^/remote.php/dav/files/" "id:2000,ctl:ruleRemoveByTag=attack-protocol,ctl:ruleRemoveByTag=attack-generic,nolog"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/passbolt/docker-compose.yml
View file

@ -20,7 +20,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=https://mypassbolt
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/php-cookie-flags/docker-compose.yml
View file

@ -25,7 +25,7 @@ services:
- REMOTE_PHP=myphp
- REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/php-multisite/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
- app2.example.com_REMOTE_PHP=myapp2
- app2.example.com_REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- net-app1

2
examples/php-singlesite/docker-compose.yml
View file

@ -24,7 +24,7 @@ services:
- REMOTE_PHP=myphp
- REMOTE_PHP_PATH=/app
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/prestashop/docker-compose.yml
View file

@ -22,7 +22,7 @@ services:
LIMIT_REQ_URL_1: "/install/index.php"
LIMIT_REQ_RATE_1: "8r/s"
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/proxy-protocol/docker-compose.yml
View file

@ -20,7 +20,7 @@ services:
- REAL_IP_FROM=10.10.10.0/24
- REAL_IP_HEADER=proxy_protocol
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- net-proxy
- bw-universe

2
examples/radarr/docker-compose.yml
View file

@ -28,7 +28,7 @@ services:
- LIMIT_REQ_URL_1=^/api/
- LIMIT_REQ_RATE_1=10r/s
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/redmine/docker-compose.yml
View file

@ -18,7 +18,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://myredmine:3000
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/reverse-proxy-multisite/docker-compose.yml
View file

@ -21,7 +21,7 @@ services:
- app2.example.com_REVERSE_PROXY_URL=/
- app2.example.com_REVERSE_PROXY_HOST=http://app2
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/reverse-proxy-singlesite/docker-compose.yml
View file

@ -26,7 +26,7 @@ services:
rewrite ^(.*)$$ $$1/ permanent;
}
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/reverse-proxy-websocket/docker-compose.yml
View file

@ -19,7 +19,7 @@ services:
- REVERSE_PROXY_HOST=http://myws:8010/
- REVERSE_PROXY_WS=yes
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/stream-multisite/docker-compose.yml
View file

@ -27,7 +27,7 @@ services:
- app2.example.com_LISTEN_STREAM_PORT=20000
- app2.example.com_LISTEN_STREAM_PORT_SSL=20001
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/syslog/docker-compose.yml
View file

@ -23,7 +23,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://myapp
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-services

2
examples/tomcat/docker-compose.yml
View file

@ -17,7 +17,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://mytomcat:8080/sample/
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/tor-hidden-service/docker-compose.yml
View file

@ -28,7 +28,7 @@ services:
- REVERSE_PROXY_URL=/
- REVERSE_PROXY_HOST=http://myapp
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
examples/web-ui/docker-compose.yml
View file

@ -21,7 +21,7 @@ services:
- www.example.com_REVERSE_PROXY_HOST=http://bw-ui:7000
- www.example.com_INTERCEPTED_ERROR_CODES=400 404 405 413 429 500 501 502 503 504
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
networks:
- bw-universe
- bw-services

2
examples/wordpress/docker-compose.yml
View file

@ -19,7 +19,7 @@ services:
REVERSE_PROXY_HOST: "http://mywp"
CUSTOM_CONF_MODSEC_CRS_wordpress: 'SecAction "id:900130,phase:1,nolog,pass,t:none,setvar:tx.crs_exclusions_wordpress=1"'
labels:
- "bunkerweb.INSTANCE" # required for the scheduler to recognize the container
- "bunkerweb.INSTANCE=yes" # required for the scheduler to recognize the container
networks:
- bw-universe
- bw-services

2
misc/integrations/autoconf.mariadb.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db

2
misc/integrations/autoconf.mariadb.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db

2
misc/integrations/autoconf.mysql.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db

2
misc/integrations/autoconf.mysql.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db

2
misc/integrations/autoconf.postgres.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db

2
misc/integrations/autoconf.postgres.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db

2
misc/integrations/autoconf.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- AUTOCONF_MODE=yes

2
misc/integrations/autoconf.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=
- AUTOCONF_MODE=yes

2
misc/integrations/docker.mariadb.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- MULTISITE=yes

2
misc/integrations/docker.mariadb.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database

2
misc/integrations/docker.mysql.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- MULTISITE=yes

2
misc/integrations/docker.mysql.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- DATABASE_URI=mysql+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database

2
misc/integrations/docker.postgres.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- MULTISITE=yes

2
misc/integrations/docker.postgres.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db # Remember to set a stronger password for the database

2
misc/integrations/docker.ui.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- MULTISITE=yes

2
misc/integrations/docker.yml
View file

@ -7,7 +7,7 @@ services:
- 80:8080
- 443:8443
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
- SERVER_NAME=www.example.com
- API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24

2
misc/integrations/swarm.mariadb.ui.yml
View file

@ -29,7 +29,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

2
misc/integrations/swarm.mariadb.yml
View file

@ -29,7 +29,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

2
misc/integrations/swarm.mysql.ui.yml
View file

@ -29,7 +29,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

2
misc/integrations/swarm.mysql.yml
View file

@ -29,7 +29,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

2
misc/integrations/swarm.postgres.ui.yml
View file

@ -29,7 +29,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

2
misc/integrations/swarm.postgres.yml
View file

@ -29,7 +29,7 @@ services:
constraints:
- "node.role == worker"
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
bw-autoconf:
image: bunkerity/bunkerweb-autoconf:1.5.3

121
src/common/db/requirements.txt
View file

@ -83,69 +83,64 @@ cryptography==41.0.5 \
--hash=sha256:ec3b055ff8f1dce8e6ef28f626e0972981475173d7973d63f271b29c8a2897da \
--hash=sha256:fba1e91467c65fe64a82c689dc6cf58151158993b13eb7a7f3f4b7f395636723
# via -r requirements.in
greenlet==3.0.0 \
--hash=sha256:02a807b2a58d5cdebb07050efe3d7deaf915468d112dfcf5e426d0564aa3aa4a \
--hash=sha256:0b72b802496cccbd9b31acea72b6f87e7771ccfd7f7927437d592e5c92ed703c \
--hash=sha256:0d3f83ffb18dc57243e0151331e3c383b05e5b6c5029ac29f754745c800f8ed9 \
--hash=sha256:10b5582744abd9858947d163843d323d0b67be9432db50f8bf83031032bc218d \
--hash=sha256:123910c58234a8d40eaab595bc56a5ae49bdd90122dde5bdc012c20595a94c14 \
--hash=sha256:1482fba7fbed96ea7842b5a7fc11d61727e8be75a077e603e8ab49d24e234383 \
--hash=sha256:19834e3f91f485442adc1ee440171ec5d9a4840a1f7bd5ed97833544719ce10b \
--hash=sha256:1d363666acc21d2c204dd8705c0e0457d7b2ee7a76cb16ffc099d6799744ac99 \
--hash=sha256:211ef8d174601b80e01436f4e6905aca341b15a566f35a10dd8d1e93f5dbb3b7 \
--hash=sha256:269d06fa0f9624455ce08ae0179430eea61085e3cf6457f05982b37fd2cefe17 \
--hash=sha256:2e7dcdfad252f2ca83c685b0fa9fba00e4d8f243b73839229d56ee3d9d219314 \
--hash=sha256:334ef6ed8337bd0b58bb0ae4f7f2dcc84c9f116e474bb4ec250a8bb9bd797a66 \
--hash=sha256:343675e0da2f3c69d3fb1e894ba0a1acf58f481f3b9372ce1eb465ef93cf6fed \
--hash=sha256:37f60b3a42d8b5499be910d1267b24355c495064f271cfe74bf28b17b099133c \
--hash=sha256:38ad562a104cd41e9d4644f46ea37167b93190c6d5e4048fcc4b80d34ecb278f \
--hash=sha256:3c0d36f5adc6e6100aedbc976d7428a9f7194ea79911aa4bf471f44ee13a9464 \
--hash=sha256:3fd2b18432e7298fcbec3d39e1a0aa91ae9ea1c93356ec089421fabc3651572b \
--hash=sha256:4a1a6244ff96343e9994e37e5b4839f09a0207d35ef6134dce5c20d260d0302c \
--hash=sha256:4cd83fb8d8e17633ad534d9ac93719ef8937568d730ef07ac3a98cb520fd93e4 \
--hash=sha256:527cd90ba3d8d7ae7dceb06fda619895768a46a1b4e423bdb24c1969823b8362 \
--hash=sha256:56867a3b3cf26dc8a0beecdb4459c59f4c47cdd5424618c08515f682e1d46692 \
--hash=sha256:621fcb346141ae08cb95424ebfc5b014361621b8132c48e538e34c3c93ac7365 \
--hash=sha256:63acdc34c9cde42a6534518e32ce55c30f932b473c62c235a466469a710bfbf9 \
--hash=sha256:6512592cc49b2c6d9b19fbaa0312124cd4c4c8a90d28473f86f92685cc5fef8e \
--hash=sha256:6672fdde0fd1a60b44fb1751a7779c6db487e42b0cc65e7caa6aa686874e79fb \
--hash=sha256:6a5b2d4cdaf1c71057ff823a19d850ed5c6c2d3686cb71f73ae4d6382aaa7a06 \
--hash=sha256:6a68d670c8f89ff65c82b936275369e532772eebc027c3be68c6b87ad05ca695 \
--hash=sha256:6bb36985f606a7c49916eff74ab99399cdfd09241c375d5a820bb855dfb4af9f \
--hash=sha256:73b2f1922a39d5d59cc0e597987300df3396b148a9bd10b76a058a2f2772fc04 \
--hash=sha256:7709fd7bb02b31908dc8fd35bfd0a29fc24681d5cc9ac1d64ad07f8d2b7db62f \
--hash=sha256:8060b32d8586e912a7b7dac2d15b28dbbd63a174ab32f5bc6d107a1c4143f40b \
--hash=sha256:80dcd3c938cbcac986c5c92779db8e8ce51a89a849c135172c88ecbdc8c056b7 \
--hash=sha256:813720bd57e193391dfe26f4871186cf460848b83df7e23e6bef698a7624b4c9 \
--hash=sha256:831d6f35037cf18ca5e80a737a27d822d87cd922521d18ed3dbc8a6967be50ce \
--hash=sha256:871b0a8835f9e9d461b7fdaa1b57e3492dd45398e87324c047469ce2fc9f516c \
--hash=sha256:952256c2bc5b4ee8df8dfc54fc4de330970bf5d79253c863fb5e6761f00dda35 \
--hash=sha256:96d9ea57292f636ec851a9bb961a5cc0f9976900e16e5d5647f19aa36ba6366b \
--hash=sha256:9a812224a5fb17a538207e8cf8e86f517df2080c8ee0f8c1ed2bdaccd18f38f4 \
--hash=sha256:9adbd8ecf097e34ada8efde9b6fec4dd2a903b1e98037adf72d12993a1c80b51 \
--hash=sha256:9de687479faec7db5b198cc365bc34addd256b0028956501f4d4d5e9ca2e240a \
--hash=sha256:a048293392d4e058298710a54dfaefcefdf49d287cd33fb1f7d63d55426e4355 \
--hash=sha256:aa15a2ec737cb609ed48902b45c5e4ff6044feb5dcdfcf6fa8482379190330d7 \
--hash=sha256:abe1ef3d780de56defd0c77c5ba95e152f4e4c4e12d7e11dd8447d338b85a625 \
--hash=sha256:ad6fb737e46b8bd63156b8f59ba6cdef46fe2b7db0c5804388a2d0519b8ddb99 \
--hash=sha256:b1660a15a446206c8545edc292ab5c48b91ff732f91b3d3b30d9a915d5ec4779 \
--hash=sha256:b505fcfc26f4148551826a96f7317e02c400665fa0883fe505d4fcaab1dabfdd \
--hash=sha256:b822fab253ac0f330ee807e7485769e3ac85d5eef827ca224feaaefa462dc0d0 \
--hash=sha256:bdd696947cd695924aecb3870660b7545a19851f93b9d327ef8236bfc49be705 \
--hash=sha256:bdfaeecf8cc705d35d8e6de324bf58427d7eafb55f67050d8f28053a3d57118c \
--hash=sha256:be557119bf467d37a8099d91fbf11b2de5eb1fd5fc5b91598407574848dc910f \
--hash=sha256:c6b5ce7f40f0e2f8b88c28e6691ca6806814157ff05e794cdd161be928550f4c \
--hash=sha256:c94e4e924d09b5a3e37b853fe5924a95eac058cb6f6fb437ebb588b7eda79870 \
--hash=sha256:cc3e2679ea13b4de79bdc44b25a0c4fcd5e94e21b8f290791744ac42d34a0353 \
--hash=sha256:d1e22c22f7826096ad503e9bb681b05b8c1f5a8138469b255eb91f26a76634f2 \
--hash=sha256:d5539f6da3418c3dc002739cb2bb8d169056aa66e0c83f6bacae0cd3ac26b423 \
--hash=sha256:d55db1db455c59b46f794346efce896e754b8942817f46a1bada2d29446e305a \
--hash=sha256:e09dea87cc91aea5500262993cbd484b41edf8af74f976719dd83fe724644cd6 \
--hash=sha256:e52a712c38e5fb4fd68e00dc3caf00b60cb65634d50e32281a9d6431b33b4af1 \
--hash=sha256:e693e759e172fa1c2c90d35dea4acbdd1d609b6936115d3739148d5e4cd11947 \
--hash=sha256:ecf94aa539e97a8411b5ea52fc6ccd8371be9550c4041011a091eb8b3ca1d810 \
--hash=sha256:f351479a6914fd81a55c8e68963609f792d9b067fb8a60a042c585a621e0de4f \
--hash=sha256:f47932c434a3c8d3c86d865443fadc1fbf574e9b11d6650b656e602b1797908a
greenlet==3.0.1 \
--hash=sha256:0a02d259510b3630f330c86557331a3b0e0c79dac3d166e449a39363beaae174 \
--hash=sha256:0b6f9f8ca7093fd4433472fd99b5650f8a26dcd8ba410e14094c1e44cd3ceddd \
--hash=sha256:100f78a29707ca1525ea47388cec8a049405147719f47ebf3895e7509c6446aa \
--hash=sha256:1757936efea16e3f03db20efd0cd50a1c86b06734f9f7338a90c4ba85ec2ad5a \
--hash=sha256:19075157a10055759066854a973b3d1325d964d498a805bb68a1f9af4aaef8ec \
--hash=sha256:19bbdf1cce0346ef7341705d71e2ecf6f41a35c311137f29b8a2dc2341374565 \
--hash=sha256:20107edf7c2c3644c67c12205dc60b1bb11d26b2610b276f97d666110d1b511d \
--hash=sha256:22f79120a24aeeae2b4471c711dcf4f8c736a2bb2fabad2a67ac9a55ea72523c \
--hash=sha256:2847e5d7beedb8d614186962c3d774d40d3374d580d2cbdab7f184580a39d234 \
--hash=sha256:28e89e232c7593d33cac35425b58950789962011cc274aa43ef8865f2e11f46d \
--hash=sha256:329c5a2e5a0ee942f2992c5e3ff40be03e75f745f48847f118a3cfece7a28546 \
--hash=sha256:337322096d92808f76ad26061a8f5fccb22b0809bea39212cd6c406f6a7060d2 \
--hash=sha256:3fcc780ae8edbb1d050d920ab44790201f027d59fdbd21362340a85c79066a74 \
--hash=sha256:41bdeeb552d814bcd7fb52172b304898a35818107cc8778b5101423c9017b3de \
--hash=sha256:4eddd98afc726f8aee1948858aed9e6feeb1758889dfd869072d4465973f6bfd \
--hash=sha256:52e93b28db27ae7d208748f45d2db8a7b6a380e0d703f099c949d0f0d80b70e9 \
--hash=sha256:55d62807f1c5a1682075c62436702aaba941daa316e9161e4b6ccebbbf38bda3 \
--hash=sha256:5805e71e5b570d490938d55552f5a9e10f477c19400c38bf1d5190d760691846 \
--hash=sha256:599daf06ea59bfedbec564b1692b0166a0045f32b6f0933b0dd4df59a854caf2 \
--hash=sha256:60d5772e8195f4e9ebf74046a9121bbb90090f6550f81d8956a05387ba139353 \
--hash=sha256:696d8e7d82398e810f2b3622b24e87906763b6ebfd90e361e88eb85b0e554dc8 \
--hash=sha256:6e6061bf1e9565c29002e3c601cf68569c450be7fc3f7336671af7ddb4657166 \
--hash=sha256:80ac992f25d10aaebe1ee15df45ca0d7571d0f70b645c08ec68733fb7a020206 \
--hash=sha256:816bd9488a94cba78d93e1abb58000e8266fa9cc2aa9ccdd6eb0696acb24005b \
--hash=sha256:85d2b77e7c9382f004b41d9c72c85537fac834fb141b0296942d52bf03fe4a3d \
--hash=sha256:87c8ceb0cf8a5a51b8008b643844b7f4a8264a2c13fcbcd8a8316161725383fe \
--hash=sha256:89ee2e967bd7ff85d84a2de09df10e021c9b38c7d91dead95b406ed6350c6997 \
--hash=sha256:8bef097455dea90ffe855286926ae02d8faa335ed8e4067326257cb571fc1445 \
--hash=sha256:8d11ebbd679e927593978aa44c10fc2092bc454b7d13fdc958d3e9d508aba7d0 \
--hash=sha256:91e6c7db42638dc45cf2e13c73be16bf83179f7859b07cfc139518941320be96 \
--hash=sha256:97e7ac860d64e2dcba5c5944cfc8fa9ea185cd84061c623536154d5a89237884 \
--hash=sha256:990066bff27c4fcf3b69382b86f4c99b3652bab2a7e685d968cd4d0cfc6f67c6 \
--hash=sha256:9fbc5b8f3dfe24784cee8ce0be3da2d8a79e46a276593db6868382d9c50d97b1 \
--hash=sha256:ac4a39d1abae48184d420aa8e5e63efd1b75c8444dd95daa3e03f6c6310e9619 \
--hash=sha256:b2c02d2ad98116e914d4f3155ffc905fd0c025d901ead3f6ed07385e19122c94 \
--hash=sha256:b2d3337dcfaa99698aa2377c81c9ca72fcd89c07e7eb62ece3f23a3fe89b2ce4 \
--hash=sha256:b489c36d1327868d207002391f662a1d163bdc8daf10ab2e5f6e41b9b96de3b1 \
--hash=sha256:b641161c302efbb860ae6b081f406839a8b7d5573f20a455539823802c655f63 \
--hash=sha256:b8ba29306c5de7717b5761b9ea74f9c72b9e2b834e24aa984da99cbfc70157fd \
--hash=sha256:b9934adbd0f6e476f0ecff3c94626529f344f57b38c9a541f87098710b18af0a \
--hash=sha256:ce85c43ae54845272f6f9cd8320d034d7a946e9773c693b27d620edec825e376 \
--hash=sha256:cf868e08690cb89360eebc73ba4be7fb461cfbc6168dd88e2fbbe6f31812cd57 \
--hash=sha256:d2905ce1df400360463c772b55d8e2518d0e488a87cdea13dd2c71dcb2a1fa16 \
--hash=sha256:d57e20ba591727da0c230ab2c3f200ac9d6d333860d85348816e1dca4cc4792e \
--hash=sha256:d6a8c9d4f8692917a3dc7eb25a6fb337bff86909febe2f793ec1928cd97bedfc \
--hash=sha256:d923ff276f1c1f9680d32832f8d6c040fe9306cbfb5d161b0911e9634be9ef0a \
--hash=sha256:daa7197b43c707462f06d2c693ffdbb5991cbb8b80b5b984007de431493a319c \
--hash=sha256:dbd4c177afb8a8d9ba348d925b0b67246147af806f0b104af4d24f144d461cd5 \
--hash=sha256:dc4d815b794fd8868c4d67602692c21bf5293a75e4b607bb92a11e821e2b859a \
--hash=sha256:e9d21aaa84557d64209af04ff48e0ad5e28c5cca67ce43444e939579d085da72 \
--hash=sha256:ea6b8aa9e08eea388c5f7a276fabb1d4b6b9d6e4ceb12cc477c3d352001768a9 \
--hash=sha256:eabe7090db68c981fca689299c2d116400b553f4b713266b130cfc9e2aa9c5a9 \
--hash=sha256:f2f6d303f3dee132b322a14cd8765287b8f86cdc10d2cb6a6fae234ea488888e \
--hash=sha256:f33f3258aae89da191c6ebaa3bc517c6c4cbc9b9f689e5d8452f7aedbb913fa8 \
--hash=sha256:f7bfb769f7efa0eefcd039dd19d843a4fbfbac52f1878b1da2ed5793ec9b1a65 \
--hash=sha256:f89e21afe925fcfa655965ca8ea10f24773a1791400989ff32f467badfe4a064 \
--hash=sha256:fa24255ae3c0ab67e613556375a4341af04a084bd58764731972bcbc8baeba36
# via sqlalchemy
psycopg2-binary==2.9.9 \
--hash=sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9 \

2
src/linux/scripts/beforeInstall.sh
View file

@ -29,7 +29,7 @@ if [ -f /etc/os-release ]; then
echo "ℹ️ Copy /var/tmp/ui.env to /etc/bunkerweb/ui.env"
do_and_check_cmd cp -f /var/tmp/ui.env /etc/bunkerweb/ui.env
fi
elif [[ "$OS" == "CentOS Linux" || "$OS" == "Fedora" ]]; then
elif [[ "$OS" == "Red Hat Enterprise Linux" || "$OS" == "Fedora" ]]; then
# Get the version of the package
VERSION=$(rpm -q --queryformat '%{VERSION}' bunkerweb)
if [ "$(printf '%s\n' "$VERSION" "$(echo '1.5.3' | tr -d ' ')" | sort -V | head -n 1)" = "$VERSION" ] && [ -f /var/tmp/variables.env ] && [ -f /var/tmp/ui.env ]; then

16
src/linux/scripts/start.sh
View file

@ -91,7 +91,7 @@ function start() {
log "SYSTEMCTL" "ℹ️" "Starting BunkerWeb service ..."
echo "nginx ALL=(ALL) NOPASSWD: /usr/sbin/nginx" > /etc/sudoers.d/bunkerweb
setcap 'CAP_NET_BIND_SERVICE=+eip' /usr/sbin/nginx
chown -R nginx:nginx /etc/nginx
# Create dummy variables.env
@ -107,6 +107,10 @@ function start() {
stop_nginx
# Generate temp conf for jobs and start nginx
DNS_RESOLVERS="$(grep "^DNS_RESOLVERS=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$DNS_RESOLVERS" = "" ] ; then
DNS_RESOLVERS="8.8.8.8 8.8.4.4"
fi
API_HTTP_PORT="$(grep "^API_HTTP_PORT=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$API_HTTP_PORT" = "" ] ; then
API_HTTP_PORT="5000"
@ -137,13 +141,13 @@ function start() {
fi
HTTP_PORT="$(grep "^HTTP_PORT=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$HTTP_PORT" = "" ] ; then
HTTP_PORT="8080"
HTTP_PORT="80"
fi
HTTPS_PORT="$(grep "^HTTPS_PORT=" /etc/bunkerweb/variables.env | cut -d '=' -f 2)"
if [ "$HTTPS_PORT" = "" ] ; then
HTTPS_PORT="8443"
HTTPS_PORT="443"
fi
sudo -E -u nginx -g nginx /bin/bash -c "echo -ne 'IS_LOADING=yes\nUSE_BUNKERNET=no\nSERVER_NAME=\nAPI_HTTP_PORT=${API_HTTP_PORT}\nAPI_SERVER_NAME=${API_SERVER_NAME}\nAPI_WHITELIST_IP=${API_WHITELIST_IP}\nUSE_REAL_IP=${USE_REAL_IP}\nUSE_PROXY_PROTOCOL=${USE_PROXY_PROTOCOL}\nREAL_IP_FROM=${REAL_IP_FROM}\nREAL_IP_HEADER=${REAL_IP_HEADER}\nHTTP_PORT=${HTTP_PORT}\nHTTPS_PORT=${HTTPS_PORT}\n' > /var/tmp/bunkerweb/tmp.env"
sudo -E -u nginx -g nginx /bin/bash -c "echo -ne 'IS_LOADING=yes\nUSE_BUNKERNET=no\nSERVER_NAME=\nDNS_RESOLVERS=${DNS_RESOLVERS}\nAPI_HTTP_PORT=${API_HTTP_PORT}\nAPI_SERVER_NAME=${API_SERVER_NAME}\nAPI_WHITELIST_IP=${API_WHITELIST_IP}\nUSE_REAL_IP=${USE_REAL_IP}\nUSE_PROXY_PROTOCOL=${USE_PROXY_PROTOCOL}\nREAL_IP_FROM=${REAL_IP_FROM}\nREAL_IP_HEADER=${REAL_IP_HEADER}\nHTTP_PORT=${HTTP_PORT}\nHTTPS_PORT=${HTTPS_PORT}\n' > /var/tmp/bunkerweb/tmp.env"
sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=/usr/share/bunkerweb/deps/python/ /usr/share/bunkerweb/gen/main.py --variables /var/tmp/bunkerweb/tmp.env --no-linux-reload"
# shellcheck disable=SC2181
if [ $? -ne 0 ] ; then
@ -157,8 +161,8 @@ function start() {
fi
# Start nginx
log "SYSTEMCTL" "ℹ️" "Starting temp nginx ..."
nginx -e /var/log/bunkerweb/error.log
log "SYSTEMCTL" "ℹ️" "Starting nginx ..."
sudo -E -u nginx -g nginx /usr/sbin/nginx -e /var/log/bunkerweb/error.log
# shellcheck disable=SC2181
if [ $? -ne 0 ] ; then
log "SYSTEMCTL" "❌" "Error while executing temp nginx"

2
src/scheduler/JobScheduler.py
View file

@ -160,7 +160,7 @@ class JobScheduler(ApiCaller):
if self.__integration not in ("Autoconf", "Swarm", "Kubernetes", "Docker"):
self.__logger.info("Reloading nginx ...")
proc = run(
["sudo", join(sep, "usr", "sbin", "nginx"), "-s", "reload"],
[join(sep, "usr", "sbin", "nginx"), "-s", "reload"],
stdin=DEVNULL,
stderr=PIPE,
env=self.__env,

4
src/scheduler/main.py
View file

@ -527,7 +527,7 @@ if __name__ == "__main__":
# Stop temp nginx
logger.info("Stopping temp nginx ...")
proc = subprocess_run(
["sudo", join(sep, "usr", "sbin", "nginx"), "-s", "stop"],
[join(sep, "usr", "sbin", "nginx"), "-s", "stop"],
stdin=DEVNULL,
stderr=STDOUT,
env=env.copy(),
@ -548,7 +548,7 @@ if __name__ == "__main__":
# Start nginx
logger.info("Starting nginx ...")
proc = subprocess_run(
["sudo", join(sep, "usr", "sbin", "nginx")],
[join(sep, "usr", "sbin", "nginx")],
stdin=DEVNULL,
stderr=STDOUT,
env=env.copy(),

2
src/scheduler/requirements.in
View file

@ -1,4 +1,4 @@
certbot==2.7.2
certbot==2.7.3
configobj==5.0.8
cryptography==41.0.5
maxminddb==2.4.0

18
src/scheduler/requirements.txt
View file

@ -4,13 +4,13 @@
#
# pip-compile --allow-unsafe --generate-hashes --strip-extras requirements.in
#
acme==2.7.2 \
--hash=sha256:52bbc5f51f9887f6ee384e1ea7a3802792e31773d661cf5f5904e3d2be5df72d \
--hash=sha256:be4f11846e101bfc36663620ae81be8a60d31c7e743568bc8b9d974884043ad7
acme==2.7.3 \
--hash=sha256:801c1d8eb8451793a88623abfd707ff3bcf31328c9a885f8fbe48721ea7f8565 \
--hash=sha256:93ec4f6ebe8dec9a063e3523f8f31fb60f540757b3cd4fb1b4c144e69b83d7b9
# via certbot
certbot==2.7.2 \
--hash=sha256:1425de7e41c29fe1734f53fea5b64c3713df0cfc1df1a23a78d7513001457e6e \
--hash=sha256:8cf818b81eee3cf12102ad39b79953b9fd0b5f59fd20f5cf2d0cf5ea5d8a9172
certbot==2.7.3 \
--hash=sha256:6e6f5dbdbd36672925572f44feccef77501a36d4eb68d63ecd5e372f09606eb0 \
--hash=sha256:e198bcf1bddff9836d408cc9928223804044e755524c42aa4481c1a626c8c80a
# via -r requirements.in
certifi==2023.7.22 \
--hash=sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082 \
@ -231,9 +231,9 @@ pycparser==2.21 \
--hash=sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9 \
--hash=sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
# via cffi
pyopenssl==23.2.0 \
--hash=sha256:24f0dc5227396b3e831f4c7f602b950a5e9833d292c8e4a2e06b709292806ae2 \
--hash=sha256:276f931f55a452e7dea69c7173e984eb2a4407ce413c918aa34b55f82f9b8bac
pyopenssl==23.3.0 \
--hash=sha256:6756834481d9ed5470f4a9393455154bc92fe7a64b7bc6ee2c804e78c52099b2 \
--hash=sha256:6b2cba5cc46e822750ec3e5a81ee12819850b11303630d575e98108a079c2b12
# via
# acme
# josepy

1
src/ui/requirements.in
View file

@ -7,3 +7,4 @@ gunicorn[gthread]==21.2.0
importlib-metadata==6.8.0
python_dateutil==2.8.2
regex==2023.10.3
werkzeug==3.0.1

1
src/ui/requirements.txt
View file

@ -250,6 +250,7 @@ werkzeug==3.0.1 \
--hash=sha256:507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb3b1dcc \
--hash=sha256:90a285dc0e42ad56b34e696398b8122ee4c681833fb35b8334a095d82c56da10
# via
# -r requirements.in
# flask
# flask-login
wtforms==3.1.0 \

10
src/ui/src/Instances.py
View file

@ -46,7 +46,7 @@ class Instance:
if self._type == "local":
return (
run(
["sudo", join(sep, "usr", "sbin", "nginx"), "-s", "reload"],
[join(sep, "usr", "sbin", "nginx"), "-s", "reload"],
stdin=DEVNULL,
stderr=STDOUT,
check=False,
@ -60,7 +60,7 @@ class Instance:
if self._type == "local":
return (
run(
["sudo", join(sep, "usr", "sbin", "nginx")],
[join(sep, "usr", "sbin", "nginx")],
stdin=DEVNULL,
stderr=STDOUT,
check=False,
@ -74,7 +74,7 @@ class Instance:
if self._type == "local":
return (
run(
["sudo", join(sep, "usr", "sbin", "nginx"), "-s", "stop"],
[join(sep, "usr", "sbin", "nginx"), "-s", "stop"],
stdin=DEVNULL,
stderr=STDOUT,
check=False,
@ -87,7 +87,7 @@ class Instance:
def restart(self) -> bool:
if self._type == "local":
proc = run(
["sudo", join(sep, "usr", "sbin", "nginx"), "-s", "stop"],
[join(sep, "usr", "sbin", "nginx"), "-s", "stop"],
stdin=DEVNULL,
stderr=STDOUT,
check=False,
@ -96,7 +96,7 @@ class Instance:
return False
return (
run(
["sudo", join(sep, "usr", "sbin", "nginx")],
[join(sep, "usr", "sbin", "nginx")],
stdin=DEVNULL,
stderr=STDOUT,
check=False,

2
tests/core/antibot/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
HTTP_PORT: "80"

2
tests/core/authbasic/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
HTTP_PORT: "80"

2
tests/core/badbehavior/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/blacklist/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/brotli/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
HTTP_PORT: "80"

2
tests/core/bunkernet/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/bwcli/docker-compose.yml
View file

@ -7,7 +7,7 @@ services:
depends_on:
- bw-redis
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
USE_BUNKERNET: "no"

2
tests/core/clientcache/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./image.png:/var/www/html/image.png
environment:

2
tests/core/cors/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./www:/var/www/html
environment:

2
tests/core/country/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/customcert/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/db/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
SERVER_NAME: "bwadm.example.com"
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"

2
tests/core/dnsbl/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/errors/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./403.html:/var/www/html/errors/403.html
- ./index.html:/var/www/html/index.html

2
tests/core/greylist/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/gzip/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
environment:
API_WHITELIST_IP: "127.0.0.0/8 10.20.30.0/24"
HTTP_PORT: "80"

2
tests/core/headers/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./www:/var/www/html
environment:

2
tests/core/inject/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/limit/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/misc/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/modsecurity/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/redirect/docker-compose.yml
View file

@ -5,7 +5,7 @@ services:
image: bunkerity/bunkerweb:1.5.3
pull_policy: never
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

2
tests/core/redis/docker-compose.yml
View file

@ -7,7 +7,7 @@ services:
depends_on:
- bw-redis
labels:
- "bunkerweb.INSTANCE"
- "bunkerweb.INSTANCE=yes"
volumes:
- ./index.html:/var/www/html/index.html
environment:

Some files were not shown because too many files have changed in this diff Show more