diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 6183450..4200d00 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -10,7 +10,7 @@ body: attributes: value: | **Thanks :heart: for taking the time to fill out this bug report!** - We kindly ask that you search to see if an issue [already exists](https://github.com/khodedawsh/marzneshin/issues?q=is%3Aissue+sort%3Acreated-desc+) for the bug you encountered. + We kindly ask that you search to see if an issue [already exists](https://github.com/marzneshin/marzneshin/issues?q=is%3Aissue+sort%3Acreated-desc+) for the bug you encountered. - type: textarea attributes: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 6d4d901..94b2f43 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -10,9 +10,9 @@ body: attributes: value: | **Thanks :heart: for taking the time to fill out this feature request report!** - We kindly ask that you search to see if an issue [already exists](https://github.com/khodedawsh/marzneshin/issues?q=is%3Aissue+sort%3Acreated-desc+) for your feature. + We kindly ask that you search to see if an issue [already exists](https://github.com/marzneshin/marzneshin/issues?q=is%3Aissue+sort%3Acreated-desc+) for your feature. - We are also happy to accept contributions from our users. For more details see [here](https://github.com/khodedawsh/marzneshin/blob/master/CONTRIBUTING.md). + We are also happy to accept contributions from our users. For more details see [here](https://github.com/marzneshin/marzneshin/blob/master/CONTRIBUTING.md). - type: textarea attributes: diff --git a/README.md b/README.md index 11bcef9..030fbd4 100755 --- a/README.md +++ b/README.md @@ -6,18 +6,18 @@

- - + + - - + +
- + @@ -26,13 +26,13 @@ - +

- - screenshots + + screenshots

@@ -51,7 +51,7 @@ Marzneshin is a censorship circumvention tool utilizing other censorship circumvention tools. -Marzneshin controls the [Marznodes](https://github.com/khodedawsh/marznode) +Marzneshin controls the [Marznodes](https://github.com/marzneshin/marznode) connected to it; monitoring/disabling/enabling users on marznode instances while marznode manages and interacts with vpn backends (such as xray). @@ -73,7 +73,7 @@ Marzneshin documentation may be found [here](https://docs.marzneshin.org). - Automated **Share link** and **QRcode** generator - System, nodes, traffic statistics, users monitoring - Integrated **Command Line Interface (CLI)** -- [**Multi-admin** support](https://github.com/khodedawsh/marzneshin/issues/73) (WIP) +- [**Multi-admin** support](https://github.com/marzneshin/marzneshin/issues/73) (WIP) - Marzneshin is decoupled from VPN backends - Resilient and fault tolerant node management @@ -91,7 +91,7 @@ Marzneshin documentation may be found [here](https://docs.marzneshin.org). # marznode -[marznode](https://github.com/khodedawsh/marznode) is the backend needed to run proxy servers. +[marznode](https://github.com/marzneshin/marznode) is the backend needed to run proxy servers. # Donation @@ -116,14 +116,14 @@ We ❤️‍🔥 contributors! If you'd like to contribute, please check out our feel free to submit a pull request or open an issue. We also welcome you to join our [Telegram](https://t.me/marzneshins) group for either support or contributing guidance. -Check [open issues](https://github.com/khodedawsh/marzneshin/issues) to help the progress of this project. +Check [open issues](https://github.com/marzneshin/marzneshin/issues) to help the progress of this project.

Thanks to all contributors who have helped Marzneshin:

- - + +

diff --git a/dashboard/src/utils/project-info.ts b/dashboard/src/utils/project-info.ts index d8ed728..9e4af44 100644 --- a/dashboard/src/utils/project-info.ts +++ b/dashboard/src/utils/project-info.ts @@ -1,8 +1,8 @@ export const projectInfo = { - repo: "khodedawsh/marzneshin", - github: "https://github.com/khodedawsh/marzneshin", - donationLink: "https://github.com/khodedawsh/marzneshin#donation", + repo: "marzneshin/marzneshin", + github: "https://github.com/marzneshin/marzneshin", + donationLink: "https://github.com/marzneshin/marzneshin#donation", website: "marzneshin.com", authors: ["Mardin", "Dawsh"] } diff --git a/script.sh b/script.sh index 62c1828..ee3c02b 100644 --- a/script.sh +++ b/script.sh @@ -8,6 +8,8 @@ DATA_DIR="/var/lib/$APP_NAME" NODE_DATA_DIR="/var/lib/$NODE_NAME" COMPOSE_FILE="$CONFIG_DIR/docker-compose.yml" +FETCH_REPO="marzneshin/marzneshin" +SCRIPT_URL="https://github.com/$FETCH_REPO/raw/master/script.sh" colorized_echo() { local color=$1 @@ -117,8 +119,6 @@ install_docker() { } install_marzneshin_script() { - FETCH_REPO="khodedawsh/marzneshin" - SCRIPT_URL="https://github.com/$FETCH_REPO/raw/master/script.sh" colorized_echo blue "Installing marzneshin script" curl -sSL $SCRIPT_URL | install -m 755 /dev/stdin /usr/local/bin/marzneshin colorized_echo green "marzneshin script installed successfully" @@ -126,7 +126,7 @@ install_marzneshin_script() { install_marzneshin() { # Fetch releases - FILES_URL_PREFIX="https://raw.githubusercontent.com/khodedawsh/marzneshin/master" + FILES_URL_PREFIX="https://raw.githubusercontent.com/marzneshin/marzneshin/master" COMPOSE_FILES_URL="https://raw.githubusercontent.com/marzneshin/marzneshin-deploy/master" database=$1 nightly=$2 @@ -151,7 +151,7 @@ install_marzneshin() { install_marznode_xray_config() { mkdir -p "$NODE_DATA_DIR" - curl -sL "https://raw.githubusercontent.com/khodedawsh/marznode/master/xray_config.json" -o "$NODE_DATA_DIR/xray_config.json" + curl -sL "https://raw.githubusercontent.com/marzneshin/marznode/master/xray_config.json" -o "$NODE_DATA_DIR/xray_config.json" colorized_echo green "Sample xray config downloaded for marznode" } @@ -219,8 +219,6 @@ marzneshin_cli() { update_marzneshin_script() { - FETCH_REPO="khodedawsh/marzneshin" - SCRIPT_URL="https://github.com/$FETCH_REPO/raw/master/script.sh" colorized_echo blue "Updating marzneshin script" curl -sSL $SCRIPT_URL | install -m 755 /dev/stdin /usr/local/bin/marzneshin colorized_echo green "marzneshin script updated successfully" diff --git a/tools/service-install.sh b/tools/service-install.sh index 900f3c7..5704981 100755 --- a/tools/service-install.sh +++ b/tools/service-install.sh @@ -2,7 +2,7 @@ SERVICE_NAME="marzneshin" SERVICE_DESCRIPTION="Marzneshin Service" -SERVICE_DOCUMENTATION="https://github.com/khodedawsh/marzneshin" +SERVICE_DOCUMENTATION="https://docs.marzneshin.org" MAIN_PY_PATH="$PWD/main.py" SERVICE_FILE="/etc/systemd/system/$SERVICE_NAME.service"