From fada7a6b5ce79e462fb8ffa12f2b7b2e06967c72 Mon Sep 17 00:00:00 2001 From: Aetherinox Date: Thu, 20 Feb 2025 22:34:12 -0700 Subject: [PATCH] chore(branding): change urls from personal to organization --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- Dockerfile | 22 +++++---- Dockerfile.aarch64 | 19 ++++---- README.md | 47 +++++++++---------- docker-entrypoint.sh | 7 ++- package.json | 6 +-- root/custom-cont-init.d/plugins | 7 ++- root/defaults/nginx/nginx.conf.sample | 7 ++- .../nginx/site-confs/default.conf.sample | 7 ++- root/defaults/nginx/ssl.conf.sample | 7 ++- .../s6-overlay/s6-rc.d/init-adduser/branding | 9 ++-- root/etc/s6-overlay/s6-rc.d/init-keygen/run | 7 ++- root/etc/s6-overlay/s6-rc.d/init-samples/run | 7 ++- 13 files changed, 74 insertions(+), 80 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 83e54a66..08820fd6 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -44,7 +44,7 @@ ### Before You Submit Please ensure you check the following items to indicate that you've read this section and completed each task -- [ ] My code follows the [Contribution Guidelines](https://github.com/https://github.com/iFlip721/tvapp2/blob/main/CONTRIBUTING.md) +- [ ] My code follows the [Contribution Guidelines](https://github.com/https://github.com/BinaryNinja/tvapp2/blob/main/CONTRIBUTING.md) - [ ] I give expressed consent for my work to be used in this repo - [ ] I have tested my work and it functions as intended - [ ] I have included documentation if the change requires such diff --git a/Dockerfile b/Dockerfile index c2833b52..8c81a385 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,9 @@ # @usage docker image which allows you to download a m3u playlist and EPG guide data from # multiple IPTV services. # @file Dockerfile -# @repo https://github.com/iFlip721/tvapp2 -# https://github.com/aetherinox/tvapp2 -# https://github.com/aetherinox/docker-base-alpine +# @repo https://github.com/BinaryNinja/tvapp2 # https://git.binaryninja.net/BinaryNinja/tvapp2 +# https://github.com/aetherinox/docker-base-alpine # # you can build your own image by running # amd64 docker build --build-arg VERSION=1.0.0 --build-arg BUILDDATE=20250218 -t tvapp2:latest -t tvapp2:1.0.0 -t tvapp2:1.0.0-amd64 -f Dockerfile . @@ -39,15 +38,20 @@ LABEL org.opencontainers.image.authors="aetherinox, iFlip721" LABEL org.opencontainers.image.vendor="BinaryNinja" LABEL org.opencontainers.image.title="TVApp2" LABEL org.opencontainers.image.description="Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client." -LABEL org.opencontainers.image.source="https://git.binaryninja.net/BinaryNinja/tvapp2" -LABEL org.opencontainers.image.repo.1="https://github.com/iFlip721/tvapp2" -LABEL org.opencontainers.image.repo.2="https://github.com/Aetherinox/tvapp2" -LABEL org.opencontainers.image.repo.3="https://git.binaryninja.net/BinaryNinja/tvapp2" -LABEL org.opencontainers.image.documentation="https://git.binaryninja.net/BinaryNinja/tvapp2/wiki" -LABEL org.opencontainers.image.url="https://github.com/Aetherinox/tvapp2/pkgs/container/tvapp2" +LABEL org.opencontainers.image.source="https://github.com/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.repo.1="https://github.com/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.repo.2="https://git.binaryninja.net/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.repo.3="https://github.com/aetherinox/docker-base-alpine" +LABEL org.opencontainers.image.documentation="https://github.com/TheBinaryNinja/tvapp2/wiki" +LABEL org.opencontainers.image.url="https://github.com/BinaryNinja/tvapp2/pkgs/container/tvapp2" LABEL org.opencontainers.image.licenses="MIT" LABEL BUILDVERSION="TVApp2 v${VERSION} Build ${BUILDDATE}" +# @repo.1 https://github.com/BinaryNinja/tvapp2 +# @repo.2 https://git.binaryninja.net/BinaryNinja/tvapp2 +# @repo.3 https://github.com/aetherinox/docker-base-alpine + + # # # Set Env Var # # diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 52cbb6d9..7f48e939 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -4,11 +4,10 @@ # @project TVApp2 # @usage docker image which allows you to download a m3u playlist and EPG guide data from # multiple IPTV services. -# @file Dockerfile -# @repo https://github.com/iFlip721/tvapp2 -# https://github.com/aetherinox/tvapp2 -# https://github.com/aetherinox/docker-base-alpine +# @file Dockerfile.aarch64 +# @repo https://github.com/BinaryNinja/tvapp2 # https://git.binaryninja.net/BinaryNinja/tvapp2 +# https://github.com/aetherinox/docker-base-alpine # # you can build your own image by running # amd64 docker build --build-arg VERSION=1.0.0 --build-arg BUILDDATE=20250218 -t tvapp2:latest -t tvapp2:1.0.0 -t tvapp2:1.0.0-amd64 -f Dockerfile . @@ -38,12 +37,12 @@ LABEL org.opencontainers.image.authors="aetherinox, iFlip721" LABEL org.opencontainers.image.vendor="BinaryNinja" LABEL org.opencontainers.image.title="TVApp2" LABEL org.opencontainers.image.description="Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client." -LABEL org.opencontainers.image.source="https://git.binaryninja.net/BinaryNinja/tvapp2" -LABEL org.opencontainers.image.repo.1="https://github.com/iFlip721/tvapp2" -LABEL org.opencontainers.image.repo.2="https://github.com/Aetherinox/tvapp2" -LABEL org.opencontainers.image.repo.3="https://git.binaryninja.net/BinaryNinja/tvapp2" -LABEL org.opencontainers.image.documentation="https://git.binaryninja.net/BinaryNinja/tvapp2/wiki" -LABEL org.opencontainers.image.url="https://github.com/Aetherinox/tvapp2/pkgs/container/tvapp2" +LABEL org.opencontainers.image.source="https://github.com/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.repo.1="https://github.com/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.repo.2="https://git.binaryninja.net/BinaryNinja/tvapp2" +LABEL org.opencontainers.image.repo.3="https://github.com/aetherinox/docker-base-alpine" +LABEL org.opencontainers.image.documentation="https://github.com/TheBinaryNinja/tvapp2/wiki" +LABEL org.opencontainers.image.url="https://github.com/BinaryNinja/tvapp2/pkgs/container/tvapp2" LABEL org.opencontainers.image.licenses="MIT" LABEL BUILDVERSION="TVApp2 v${VERSION} Build ${BUILDDATE}" diff --git a/README.md b/README.md index 9406f84a..ac8718cf 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,7 @@ This project contains several repositories which all share the same code; use them as backups: -- [https://github.com/iFlip721/tvapp2](https://github.com/iFlip721/tvapp2) -- [https://github.com/Aetherinox/tvapp2](https://github.com/Aetherinox/tvapp2) +- [https://github.com/BinaryNinja/tvapp2](https://github.com/BinaryNinja/tvapp2) - [https://git.binaryninja.net/BinaryNinja/tvapp2](https://git.binaryninja.net/BinaryNinja/tvapp2)
@@ -317,7 +316,7 @@ mkdir tvapp2 && cd tvapp2 git clone https://git.binaryninja.net/BinaryNinja/tvapp2.git ./ # to clone from our github website -git clone https://github.com/iFlip721/tvapp2.git ./ +git clone https://github.com/BinaryNinja/tvapp2.git ./ ```
@@ -641,7 +640,7 @@ This repository and this project serves in memory of the developer [dtankdempse] - dtankdempse
dtankdempse
💻 + dtankdempse
dtankdempse
💻 @@ -663,7 +662,7 @@ We are always looking for contributors. If you feel that you can provide somethi
Want to help but can't write code? -- Review [active questions by our community](https://github.com/iFlip721/tvapp2/labels/help%20wanted) and answer the ones you know. +- Review [active questions by our community](https://github.com/BinaryNinja/tvapp2/labels/help%20wanted) and answer the ones you know.
@@ -688,13 +687,13 @@ The following people have helped get this project going: - Aetherinox
Aetherinox
💻 + Aetherinox
Aetherinox
💻 - iFlip721
iFlip721
💻 + iFlip721
iFlip721
💻 - Nvmdfth
Optx
💻 + Nvmdfth
Optx
💻 @@ -713,37 +712,37 @@ The following people have helped get this project going: [general-npmtrends-uri]: http://npmtrends.com/csf-firewall - [github-version-img]: https://img.shields.io/github/v/tag/iFlip721/tvapp2?logo=GitHub&label=Version&color=ba5225 - [github-version-uri]: https://github.com/iFlip721/tvapp2/releases + [github-version-img]: https://img.shields.io/github/v/tag/BinaryNinja/tvapp2?logo=GitHub&label=Version&color=ba5225 + [github-version-uri]: https://github.com/BinaryNinja/tvapp2/releases [license-mit-img]: https://img.shields.io/badge/MIT-FFF?logo=creativecommons&logoColor=FFFFFF&label=License&color=9d29a0 - [license-mit-uri]: https://github.com/iFlip721/tvapp2/blob/main/LICENSE + [license-mit-uri]: https://github.com/BinaryNinja/tvapp2/blob/main/LICENSE - [github-downloads-img]: https://img.shields.io/github/downloads/iFlip721/tvapp2/total?logo=github&logoColor=FFFFFF&label=Downloads&color=376892 - [github-downloads-uri]: https://github.com/iFlip721/tvapp2/releases + [github-downloads-img]: https://img.shields.io/github/downloads/BinaryNinja/tvapp2/total?logo=github&logoColor=FFFFFF&label=Downloads&color=376892 + [github-downloads-uri]: https://github.com/BinaryNinja/tvapp2/releases - [github-size-img]: https://img.shields.io/github/repo-size/iFlip721/tvapp2?logo=github&label=Size&color=59702a - [github-size-uri]: https://github.com/iFlip721/tvapp2/releases + [github-size-img]: https://img.shields.io/github/repo-size/BinaryNinja/tvapp2?logo=github&label=Size&color=59702a + [github-size-uri]: https://github.com/BinaryNinja/tvapp2/releases - [contribs-all-img]: https://img.shields.io/github/all-contributors/iFlip721/tvapp2?logo=contributorcovenant&color=de1f6f&label=contributors + [contribs-all-img]: https://img.shields.io/github/all-contributors/BinaryNinja/tvapp2?logo=contributorcovenant&color=de1f6f&label=contributors [contribs-all-uri]: https://github.com/all-contributors/all-contributors - [github-build-img]: https://img.shields.io/github/actions/workflow/status/iFlip721/tvapp2/npm-release.yml?logo=github&logoColor=FFFFFF&label=Build&color=%23278b30 - [github-build-uri]: https://github.com/iFlip721/tvapp2/actions/workflows/npm-release.yml + [github-build-img]: https://img.shields.io/github/actions/workflow/status/BinaryNinja/tvapp2/npm-release.yml?logo=github&logoColor=FFFFFF&label=Build&color=%23278b30 + [github-build-uri]: https://github.com/BinaryNinja/tvapp2/actions/workflows/npm-release.yml - [github-build-pypi-img]: https://img.shields.io/github/actions/workflow/status/iFlip721/tvapp2/release-pypi.yml?logo=github&logoColor=FFFFFF&label=Build&color=%23278b30 - [github-build-pypi-uri]: https://github.com/iFlip721/tvapp2/actions/workflows/pypi-release.yml + [github-build-pypi-img]: https://img.shields.io/github/actions/workflow/status/BinaryNinja/tvapp2/release-pypi.yml?logo=github&logoColor=FFFFFF&label=Build&color=%23278b30 + [github-build-pypi-uri]: https://github.com/BinaryNinja/tvapp2/actions/workflows/pypi-release.yml - [github-tests-img]: https://img.shields.io/github/actions/workflow/status/iFlip721/tvapp2/npm-tests.yml?logo=github&label=Tests&color=2c6488 - [github-tests-uri]: https://github.com/iFlip721/tvapp2/actions/workflows/npm-tests.yml + [github-tests-img]: https://img.shields.io/github/actions/workflow/status/BinaryNinja/tvapp2/npm-tests.yml?logo=github&label=Tests&color=2c6488 + [github-tests-uri]: https://github.com/BinaryNinja/tvapp2/actions/workflows/npm-tests.yml - [github-commit-img]: https://img.shields.io/github/last-commit/iFlip721/tvapp2?logo=conventionalcommits&logoColor=FFFFFF&label=Last%20Commit&color=313131 - [github-commit-uri]: https://github.com/iFlip721/tvapp2/commits/main/ + [github-commit-img]: https://img.shields.io/github/last-commit/BinaryNinja/tvapp2?logo=conventionalcommits&logoColor=FFFFFF&label=Last%20Commit&color=313131 + [github-commit-uri]: https://github.com/BinaryNinja/tvapp2/commits/main/ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b6048188..6424299d 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -4,11 +4,10 @@ # @project TVApp2 # @usage docker image which allows you to download a m3u playlist and EPG guide data from # multiple IPTV services. -# @file Dockerfile -# @repo https://github.com/iFlip721/tvapp2 -# https://github.com/aetherinox/tvapp2 -# https://github.com/aetherinox/docker-base-alpine +# @file docker-entrypoint.sh +# @repo https://github.com/BinaryNinja/tvapp2 # https://git.binaryninja.net/BinaryNinja/tvapp2 +# https://github.com/aetherinox/docker-base-alpine # # you can build your own image by running # amd64 docker build --build-arg VERSION=1.0.0 --build-arg BUILDDATE=20250218 -t tvapp2:latest -t tvapp2:1.0.0 -t tvapp2:1.0.0-amd64 -f Dockerfile . diff --git a/package.json b/package.json index c553c96e..32ec3fa7 100644 --- a/package.json +++ b/package.json @@ -2,18 +2,18 @@ "name": "tvapp2", "version": "1.0.0", "description": "This package allows you to generate M3U playlists and EPG guides from various online IPTV services.", - "author": "Aetherinox", + "author": "BinaryNinja", "license": "MIT", "main": "index.js", "build": { "appId": "com.tvapp2.id" }, "bugs": { - "url": "https://github.com/iFlip721/tvapp2/issues" + "url": "https://github.com/BinaryNinja/tvapp2/issues" }, "repository": { "type": "git", - "url": "https://github.com/iFlip721/tvapp2.git" + "url": "https://github.com/BinaryNinja/tvapp2.git" }, "contributors": [ { diff --git a/root/custom-cont-init.d/plugins b/root/custom-cont-init.d/plugins index 50bdfb7e..f00b2679 100644 --- a/root/custom-cont-init.d/plugins +++ b/root/custom-cont-init.d/plugins @@ -4,10 +4,9 @@ # @project TVApp2 # @usage Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. # @file plugins -# @repo.1 https://github.com/iFlip721/tvapp2 -# @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 -# @repo.alpine https://github.com/Aetherinox/docker-base-alpine +# @repo.1 https://github.com/BinaryNinja/tvapp2 +# @repo.2 https://git.binaryninja.net/BinaryNinja/tvapp2 +# @repo.3 https://github.com/aetherinox/docker-base-alpine # # PLUGINS_PATH="/config/www/plugins" diff --git a/root/defaults/nginx/nginx.conf.sample b/root/defaults/nginx/nginx.conf.sample index cb58f091..40a27bfb 100644 --- a/root/defaults/nginx/nginx.conf.sample +++ b/root/defaults/nginx/nginx.conf.sample @@ -2,10 +2,9 @@ # @project TVApp2 # @usage Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. # @file nginx.conf.sample -# @repo.1 https://github.com/iFlip721/tvapp2 -# @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 -# @repo.alpine https://github.com/Aetherinox/docker-base-alpine +# @repo.1 https://github.com/BinaryNinja/tvapp2 +# @repo.2 https://git.binaryninja.net/BinaryNinja/tvapp2 +# @repo.3 https://github.com/aetherinox/docker-base-alpine # # user dockerx; diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 5843cded..df0a2677 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -2,10 +2,9 @@ # @project TVApp2 # @usage Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. # @file default.conf.sample -# @repo.1 https://github.com/iFlip721/tvapp2 -# @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 -# @repo.alpine https://github.com/Aetherinox/docker-base-alpine +# @repo.1 https://github.com/BinaryNinja/tvapp2 +# @repo.2 https://git.binaryninja.net/BinaryNinja/tvapp2 +# @repo.3 https://github.com/aetherinox/docker-base-alpine # # server diff --git a/root/defaults/nginx/ssl.conf.sample b/root/defaults/nginx/ssl.conf.sample index fe8c5dc3..ff426a42 100644 --- a/root/defaults/nginx/ssl.conf.sample +++ b/root/defaults/nginx/ssl.conf.sample @@ -2,10 +2,9 @@ # @project TVApp2 # @usage Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. # @file nginx.conf.sample -# @repo.1 https://github.com/iFlip721/tvapp2 -# @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 -# @repo.alpine https://github.com/Aetherinox/docker-base-alpine +# @repo.1 https://github.com/BinaryNinja/tvapp2 +# @repo.2 https://git.binaryninja.net/BinaryNinja/tvapp2 +# @repo.3 https://github.com/aetherinox/docker-base-alpine # # # # diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/branding b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding index cde8df00..9e21901c 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-adduser/branding +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/branding @@ -1,19 +1,18 @@ ────────────────────────────────────────────────────────────────────────────────────────── TVApp2 Docker Image ────────────────────────────────────────────────────────────────────────────────────────── - The TvApp2 image allows you to fetch m3u playlist and EPG data for numerous + The TvApp2 image allows you to fetch M3U playlist and EPG data for numerous IPTV services online. Once the files are fetched by the image, you can visit the self-hosted webpage, - copy the links to the m3u and EPG files; and add them to your favorite IPTV app + copy the links to the M3U and EPG files; and add them to your favorite IPTV app such as Jellyfin, Plex, or Emby. For more information about this project; visit the links below. This app is served on multiple repositories as backup. Use any of the repo links below: - TVApp2 Repo 1 https://github.com/iFlip721/tvapp2 - TVApp2 Repo 2 https://github.com/Aetherinox/tvapp2 - TVApp2 Repo 3 https://git.binaryninja.net/BinaryNinja/tvapp2 + TVApp2 Repo 1 https://github.com/BinaryNinja/tvapp2 + TVApp2 Repo 2 https://git.binaryninja.net/BinaryNinja/tvapp2 Base Alpine Image https://github.com/Aetherinox/docker-base-alpine If you are making this container available on a public-facing domain, diff --git a/root/etc/s6-overlay/s6-rc.d/init-keygen/run b/root/etc/s6-overlay/s6-rc.d/init-keygen/run index 98bd917e..f123e3b7 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-keygen/run +++ b/root/etc/s6-overlay/s6-rc.d/init-keygen/run @@ -5,10 +5,9 @@ # @project TVApp2 # @usage Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. # @file run -# @repo.1 https://github.com/iFlip721/tvapp2 -# @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 -# @repo.alpine https://github.com/Aetherinox/docker-base-alpine +# @repo.1 https://github.com/BinaryNinja/tvapp2 +# @repo.2 https://git.binaryninja.net/BinaryNinja/tvapp2 +# @repo.3 https://github.com/aetherinox/docker-base-alpine # # SUBJECT="/C=NA/ST=NA/L=NA/O=BinaryNinja/OU=TVApp2 Docker Image/CN=*" diff --git a/root/etc/s6-overlay/s6-rc.d/init-samples/run b/root/etc/s6-overlay/s6-rc.d/init-samples/run index e118d3fe..fab0d060 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-samples/run +++ b/root/etc/s6-overlay/s6-rc.d/init-samples/run @@ -5,8 +5,7 @@ # @project TVApp2 # @usage Automatic m3u and xml guide updater for TheTvApp, TVPass, and MoveOnJoy utilized within your IPTV client. # @file run -# @repo.1 https://github.com/iFlip721/tvapp2 -# @repo.2 https://github.com/Aetherinox/tvapp2 -# @repo.3 https://git.binaryninja.net/BinaryNinja/tvapp2 -# @repo.alpine https://github.com/Aetherinox/docker-base-alpine +# @repo.1 https://github.com/BinaryNinja/tvapp2 +# @repo.2 https://git.binaryninja.net/BinaryNinja/tvapp2 +# @repo.3 https://github.com/aetherinox/docker-base-alpine # #