Skip to content

Commit

Permalink
upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
Niraj-Dilshan committed Dec 1, 2023
1 parent 01b0d35 commit 2d27411
Show file tree
Hide file tree
Showing 42 changed files with 137 additions and 1,345 deletions.
10 changes: 5 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ UVICORN_HOST = "0.0.0.0"
UVICORN_PORT = 8000


## We highly recommend add admin using `marzban cli` tool and do not use
## We highly recommend add admin using `infinity cli` tool and do not use
## the following variables which is somehow hard codded infrmation.
# SUDO_USERNAME = "admin"
# SUDO_PASSWORD = "admin"

# UVICORN_UDS: "/run/marzban.socket"
# UVICORN_SSL_CERTFILE = "/var/lib/marzban/certs/example.com/fullchain.pem"
# UVICORN_SSL_KEYFILE = "/var/lib/marzban/certs/example.com/key.pem"
# UVICORN_UDS: "/run/infinity.socket"
# UVICORN_SSL_CERTFILE = "/var/lib/infinity/certs/example.com/fullchain.pem"
# UVICORN_SSL_KEYFILE = "/var/lib/infinity/certs/example.com/key.pem"


# XRAY_JSON = "xray_config.json"
Expand All @@ -28,7 +28,7 @@ UVICORN_PORT = 8000

# DISCORD_WEBHOOK_URL = "https://discord.com/api/webhooks/xxxxxxx"

# CUSTOM_TEMPLATES_DIRECTORY="/var/lib/marzban/templates/"
# CUSTOM_TEMPLATES_DIRECTORY="/var/lib/infinity/templates/"
# CLASH_SUBSCRIPTION_TEMPLATE="clash/my-custom-template.yml"
# SUBSCRIPTION_PAGE_TEMPLATE="subscription/index.html"
# HOME_PAGE_TEMPLATE="home/index.html"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
gozargah/marzban:${{github.ref_name}}
ghcr.io/gozargah/marzban:${{github.ref_name}}
Niraj-Dilshan/infinity:${{github.ref_name}}
ghcr.io/Niraj-Dilshan/infinity:${{github.ref_name}}
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
platforms: linux/amd64,linux/arm64
push: true
tags: |
gozargah/marzban:latest
gozargah/marzban:${{github.ref_name}}
ghcr.io/gozargah/marzban:latest
ghcr.io/gozargah/marzban:${{github.ref_name}}
Niraj-Dilshan/infinity:latest
Niraj-Dilshan/infinity:${{github.ref_name}}
ghcr.io/Niraj-Dilshan/infinity:latest
ghcr.io/Niraj-Dilshan/infinity:${{github.ref_name}}
68 changes: 0 additions & 68 deletions CONTRIBUTING.md

This file was deleted.

8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apt-get update \
&& apt-get install -y curl unzip gcc python3-dev \
&& rm -rf /var/lib/apt/lists/*

RUN bash -c "$(curl -L https://github.com/Gozargah/Marzban-scripts/raw/master/install_latest_xray.sh)"
RUN bash -c "$(curl -L https://github.com/Niraj-Dilshan/infinity-script/raw/master/install_latest_xray.sh)"

COPY ./requirements.txt /code/
RUN pip install --no-cache-dir --upgrade -r /code/requirements.txt
Expand All @@ -17,8 +17,8 @@ COPY . /code

RUN apt-get remove -y curl unzip gcc python3-dev

RUN ln -s /code/marzban-cli.py /usr/bin/marzban-cli \
&& chmod +x /usr/bin/marzban-cli \
&& marzban-cli completion install --shell bash
RUN ln -s /code/infinity-cli.py /usr/bin/infinity-cli \
&& chmod +x /usr/bin/infinity-cli \
&& infinity-cli completion install --shell bash

CMD ["bash", "-c", "alembic upgrade head; python main.py"]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 21 January 2023

Copyright (C) 2023 Gozargah organization.
Copyright (C) 2023 Niraj-Dilshan organization.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down
Loading

0 comments on commit 2d27411

Please sign in to comment.