mirror of
https://github.com/bunkerity/bunkerweb
synced 2026-05-24 09:28:37 +00:00
Lint files
This commit is contained in:
parent
9fb8dfca45
commit
673ee921f6
15 changed files with 37 additions and 36 deletions
6
.github/workflows/beta.yml
vendored
6
.github/workflows/beta.yml
vendored
|
|
@ -7,7 +7,6 @@ on:
|
|||
branches: [beta]
|
||||
|
||||
jobs:
|
||||
|
||||
# Build amd64 + 386 containers images
|
||||
build-containers:
|
||||
strategy:
|
||||
|
|
@ -145,7 +144,8 @@ jobs:
|
|||
needs: [create-arm, wait-builds]
|
||||
strategy:
|
||||
matrix:
|
||||
image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
|
||||
image:
|
||||
[bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
|
||||
include:
|
||||
- release: beta
|
||||
- image: bunkerweb
|
||||
|
|
@ -281,5 +281,3 @@ jobs:
|
|||
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
|
||||
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
|
||||
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
|
||||
|
||||
|
|
|
|||
1
.github/workflows/create-arm.yml
vendored
1
.github/workflows/create-arm.yml
vendored
|
|
@ -72,4 +72,3 @@ jobs:
|
|||
run: ssh root@$SSH_IP "curl -fsSL https://test.docker.com -o test-docker.sh ; sh test-docker.sh"
|
||||
env:
|
||||
SSH_IP: ${{ fromJson(steps.scw.outputs.json).public_ip.address }}
|
||||
|
||||
|
|
|
|||
3
.github/workflows/doc-to-pdf.yml
vendored
3
.github/workflows/doc-to-pdf.yml
vendored
|
|
@ -17,7 +17,7 @@ jobs:
|
|||
- name: Install Python
|
||||
uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.10'
|
||||
python-version: "3.10"
|
||||
- name: Install doc requirements
|
||||
run: pip install -r docs/requirements.txt
|
||||
- name: Install chromium
|
||||
|
|
@ -36,4 +36,3 @@ jobs:
|
|||
with:
|
||||
name: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf
|
||||
path: BunkerWeb_documentation_v${{ inputs.VERSION }}.pdf
|
||||
|
||||
|
|
|
|||
6
.github/workflows/linux-build.yml
vendored
6
.github/workflows/linux-build.yml
vendored
|
|
@ -42,19 +42,19 @@ jobs:
|
|||
if: inputs.RELEASE == 'testing'
|
||||
run: ./misc/update-version.sh testing
|
||||
- name: Extract arch
|
||||
run : |
|
||||
run: |
|
||||
echo "ARCH=${{ env.PLATFORMS }}" | sed 's/linux//g' | sed 's@/@@g' >> "$GITHUB_ENV"
|
||||
env:
|
||||
PLATFORMS: ${{ inputs.PLATFORMS }}
|
||||
- name: Extract linux arch
|
||||
if: inputs.PACKAGE == 'rpm'
|
||||
run : |
|
||||
run: |
|
||||
echo "LARCH=${{ env.ARCH }}" | sed 's/amd64/x86_64/g' | sed 's/arm64/aarch64/g' >> "$GITHUB_ENV"
|
||||
env:
|
||||
ARCH: ${{ env.ARCH }}
|
||||
- name: Extract linux arch
|
||||
if: inputs.PACKAGE == 'deb'
|
||||
run : |
|
||||
run: |
|
||||
echo "LARCH=${{ env.ARCH }}" >> "$GITHUB_ENV"
|
||||
env:
|
||||
ARCH: ${{ env.ARCH }}
|
||||
|
|
|
|||
2
.github/workflows/push-doc.yml
vendored
2
.github/workflows/push-doc.yml
vendored
|
|
@ -31,7 +31,7 @@ jobs:
|
|||
git config --global user.email "bunkerbot@bunkerity.com"
|
||||
- uses: actions/setup-python@v4
|
||||
with:
|
||||
python-version: '3.10'
|
||||
python-version: "3.10"
|
||||
- name: Install doc requirements
|
||||
run: pip install -r docs/requirements.txt
|
||||
- name: Push doc
|
||||
|
|
|
|||
1
.github/workflows/push-github.yml
vendored
1
.github/workflows/push-github.yml
vendored
|
|
@ -95,4 +95,3 @@ jobs:
|
|||
prerelease: ${{ inputs.PRERELEASE }}
|
||||
name: Testing
|
||||
tag_name: ${{ inputs.VERSION }}
|
||||
|
||||
|
|
|
|||
6
.github/workflows/release.yml
vendored
6
.github/workflows/release.yml
vendored
|
|
@ -7,7 +7,6 @@ on:
|
|||
branches: [master]
|
||||
|
||||
jobs:
|
||||
|
||||
# Build amd64 + 386 containers images
|
||||
build-containers:
|
||||
strategy:
|
||||
|
|
@ -145,7 +144,8 @@ jobs:
|
|||
needs: [create-arm, wait-builds]
|
||||
strategy:
|
||||
matrix:
|
||||
image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
|
||||
image:
|
||||
[bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
|
||||
include:
|
||||
- release: latest
|
||||
- image: bunkerweb
|
||||
|
|
@ -280,4 +280,4 @@ jobs:
|
|||
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
|
||||
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
|
||||
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
|
||||
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
|
|
|
|||
2
.github/workflows/rm-arm.yml
vendored
2
.github/workflows/rm-arm.yml
vendored
|
|
@ -30,4 +30,4 @@ jobs:
|
|||
access-key: ${{ secrets.SCW_ACCESS_KEY }}
|
||||
secret-key: ${{ secrets.SCW_SECRET_KEY }}
|
||||
default-project-id: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
|
||||
default-organization-id: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
default-organization-id: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
|
|
|
|||
3
.github/workflows/staging.yml
vendored
3
.github/workflows/staging.yml
vendored
|
|
@ -7,7 +7,6 @@ on:
|
|||
branches: [staging]
|
||||
|
||||
jobs:
|
||||
|
||||
# Build Docker images
|
||||
build-containers:
|
||||
permissions:
|
||||
|
|
@ -272,4 +271,4 @@ jobs:
|
|||
uses: ./.github/workflows/push-github.yml
|
||||
with:
|
||||
VERSION: testing
|
||||
PRERELEASE: true
|
||||
PRERELEASE: true
|
||||
|
|
|
|||
|
|
@ -541,11 +541,15 @@ def services():
|
|||
message = ""
|
||||
|
||||
if request.form["operation"] == "new":
|
||||
message = f"Creating service {variables.get('SERVER_NAME', '').split(' ')[0]}"
|
||||
message = (
|
||||
f"Creating service {variables.get('SERVER_NAME', '').split(' ')[0]}"
|
||||
)
|
||||
elif request.form["operation"] == "edit":
|
||||
message = f"Saving configuration for service {request.form.get('OLD_SERVER_NAME', '').split(' ')[0]}"
|
||||
elif request.form["operation"] == "delete":
|
||||
message = f"Deleting service {request.form.get('SERVER_NAME', '').split(' ')[0]}"
|
||||
message = (
|
||||
f"Deleting service {request.form.get('SERVER_NAME', '').split(' ')[0]}"
|
||||
)
|
||||
|
||||
return redirect(url_for("loading", next=url_for("services"), message=message))
|
||||
|
||||
|
|
@ -728,7 +732,8 @@ def configs():
|
|||
join(sep, "etc", "bunkerweb", "configs"),
|
||||
db_data=db.get_custom_configs(),
|
||||
services=app.config["CONFIG"]
|
||||
.get_config(methods=False).get("SERVER_NAME", "")
|
||||
.get_config(methods=False)
|
||||
.get("SERVER_NAME", "")
|
||||
.split(" "),
|
||||
)
|
||||
],
|
||||
|
|
@ -1174,7 +1179,8 @@ def cache():
|
|||
is_cache=True,
|
||||
db_data=db.get_jobs_cache_files(),
|
||||
services=app.config["CONFIG"]
|
||||
.get_config(methods=False).get("SERVER_NAME", "")
|
||||
.get_config(methods=False)
|
||||
.get("SERVER_NAME", "")
|
||||
.split(" "),
|
||||
)
|
||||
],
|
||||
|
|
|
|||
|
|
@ -434,16 +434,19 @@
|
|||
name="csrf_token"
|
||||
value="{{ csrf_token() }}"
|
||||
/>
|
||||
<input {% if dark_mode == True %}checked{% endif %} id="darkMode"
|
||||
data-dark-toggle class="dark:brightness-125 hover:brightness-75 rounded-10
|
||||
duration-300 ease-in-out after:rounded-circle after:shadow-2xl
|
||||
after:duration-300 checked:after:translate-x-5.3 h-5 mt-0.5 relative
|
||||
float-left w-10 cursor-pointer appearance-none border border-solid
|
||||
border-gray-200 bg-slate-800/10 bg-none bg-contain bg-left bg-no-repeat
|
||||
align-top transition-all after:absolute after:top-px after:h-4 after:w-4
|
||||
after:translate-x-px after:bg-white after:content-['']
|
||||
checked:border-primary checked:bg-primary checked:bg-none
|
||||
checked:bg-right" type="checkbox" />
|
||||
<input
|
||||
{%
|
||||
if
|
||||
dark_mode=""
|
||||
="True"
|
||||
%}checked{%
|
||||
endif
|
||||
%}
|
||||
id="darkMode"
|
||||
data-dark-toggle
|
||||
class="dark:brightness-125 hover:brightness-75 rounded-10 duration-300 ease-in-out after:rounded-circle after:shadow-2xl after:duration-300 checked:after:translate-x-5.3 h-5 mt-0.5 relative float-left w-10 cursor-pointer appearance-none border border-solid border-gray-200 bg-slate-800/10 bg-none bg-contain bg-left bg-no-repeat align-top transition-all after:absolute after:top-px after:h-4 after:w-4 after:translate-x-px after:bg-white after:content-[''] checked:border-primary checked:bg-primary checked:bg-none checked:bg-right"
|
||||
type="checkbox"
|
||||
/>
|
||||
<label
|
||||
for="darkMode"
|
||||
data-dark-toggle-label
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
name: urllib3<2
|
||||
state: forcereinstall
|
||||
executable: pip3
|
||||
extra_args:
|
||||
extra_args:
|
||||
|
||||
- name: Init Docker Swarm
|
||||
community.general.docker_swarm:
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ services:
|
|||
volumes:
|
||||
bw-data:
|
||||
|
||||
|
||||
networks:
|
||||
bw-universe:
|
||||
name: bw-universe
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ services:
|
|||
volumes:
|
||||
bw-data:
|
||||
|
||||
|
||||
networks:
|
||||
bw-universe:
|
||||
name: bw-universe
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@
|
|||
"version": "0.1",
|
||||
"stream": "no",
|
||||
"settings": {}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue