Rename project to Oryx. v5.14.15

Author: winlinvip

.github/workflows/pullrequest.yml

@@ -271,7 +271,7 @@ jobs:
       - name: Install package
         run: |
           sudo bash build/oryx/scripts/setup-ubuntu/install.sh --verbose
-          echo "" && echo "/usr/local/srs-stack/" && du -sh /usr/local/srs-stack/*
+          echo "" && echo "/usr/local/oryx/" && du -sh /usr/local/oryx/*
           echo "" && ls -lha /data /data/config
       - name: Check and Test service
         run: |
@@ -360,7 +360,7 @@ jobs:
       - name: Install package
         run: |
           sudo bash build/oryx/scripts/setup-ubuntu/install.sh --verbose
-          echo "" && echo "/usr/local/srs-stack/" && du -sh /usr/local/srs-stack/*
+          echo "" && echo "/usr/local/oryx/" && du -sh /usr/local/oryx/*
           echo "" && ls -lha /data /data/config
       - name: Check and Test service
         run: |

.gitignore

@@ -129,10 +129,8 @@ t.md
 /build
 /*.tar
 /*.gz
-/srs-stack2
 /oryx
 /test/oryx.test
-/test/srs-stack.test
 __pycache__
 *.flv
 *.mp4

DEVELOPER.md

@@ -88,7 +88,7 @@ docker stop redis 2>/dev/null || echo ok && docker rm -f redis srs 2>/dev/null &
 docker run --rm -it --name oryx -v $HOME/data:/data \
   -p 2022:2022 -p 2443:2443 -p 1935:1935 -p 8000:8000/udp -p 10080:10080/udp \
   -p 80:2022 -p 443:2443 -e CANDIDATE=$(ifconfig en0 |grep 'inet ' |awk '{print $2}') \
-  -v $(pwd)/platform/platform:/usr/local/srs-stack/platform/platform \
+  -v $(pwd)/platform/platform:/usr/local/oryx/platform/platform \
   platform
 ```
 

Dockerfile

@@ -44,11 +44,11 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update -y && apt-get install -y upx
 
 RUN echo "Before UPX for $TARGETARCH" && \
-    ls -lh /usr/local/srs/objs/srs /usr/local/srs-stack/platform/platform && \
+    ls -lh /usr/local/srs/objs/srs /usr/local/oryx/platform/platform && \
     upx --best --lzma /usr/local/srs/objs/srs && \
-    upx --best --lzma /usr/local/srs-stack/platform/platform && \
+    upx --best --lzma /usr/local/oryx/platform/platform && \
     echo "After UPX for $TARGETARCH" && \
-    ls -lh /usr/local/srs/objs/srs /usr/local/srs-stack/platform/platform
+    ls -lh /usr/local/srs/objs/srs /usr/local/oryx/platform/platform
 
 # http://releases.ubuntu.com/focal/
 #FROM ${ARCH}ubuntu:focal AS dist
@@ -58,12 +58,12 @@ FROM ${ARCH}ossrs/oryx:focal-1 AS dist
 EXPOSE 2022 2443 1935 8080 5060 9000 8000/udp 10080/udp
 
 # Copy files from build.
-COPY --from=build /usr/local/srs-stack /usr/local/srs-stack
+COPY --from=build /usr/local/oryx /usr/local/oryx
 COPY --from=build /usr/local/srs /usr/local/srs
 
 # Prepare data directory.
 RUN mkdir -p /data && \
-    cd /usr/local/srs-stack/platform/containers && \
+    cd /usr/local/oryx/platform/containers && \
     rm -rf data && ln -sf /data .
 
 CMD ["./bootstrap"]

Makefile

@@ -1,6 +1,6 @@
 .PHONY: default build build-no-ui install run uninstall upgrade test npm help clean
 
-PREFIX ?= /usr/local/srs-stack
+PREFIX ?= /usr/local/oryx
 __REAL_INSTALL = $(DESTDIR)$(PREFIX)
 
 default: build
@@ -42,7 +42,7 @@ else
 	rm -rf $(__REAL_INSTALL)/platform/containers/objs/*
 	rm -rf $(__REAL_INSTALL)/platform/containers/data/*
 	cp -rf usr $(__REAL_INSTALL)/usr
-	sed -i "s|/usr/local/srs-stack|$(PREFIX)|g" $(__REAL_INSTALL)/usr/lib/systemd/system/oryx.service
+	sed -i "s|/usr/local/oryx|$(PREFIX)|g" $(__REAL_INSTALL)/usr/lib/systemd/system/oryx.service
 endif
 
 uninstall:

focal/Dockerfile

@@ -51,4 +51,4 @@ COPY --from=upx /usr/local/bin/lego \
 ENV PORT=":2024" NODE_ENV=production CLOUD=DOCKER PLATFORM_DOCKER=on
 
 # Setup the work directory to platform.
-WORKDIR /usr/local/srs-stack/platform
+WORKDIR /usr/local/oryx/platform

platform/auto/start_srs

@@ -37,7 +37,7 @@ if [[ ! -s ${WORK_DIR}/containers/data/config/srs.vhost.conf ]]; then
     echo '# OK' > ${WORK_DIR}/containers/data/config/srs.vhost.conf
 fi
 
-# Current directory should be /usr/local/srs-stack/platform
+# Current directory should be /usr/local/oryx/platform
 # We don't check the exit value, see https://github.com/ossrs/srs/issues/3757
 /usr/local/srs/objs/srs $SRS_PARAMS
 if [[ $? -ne 0 ]]; then echo "Warning: SRS start with none zero, but might be ok, see #3757."; fi

platform/utils.go

@@ -48,7 +48,7 @@ func (v Versions) String() string {
 // TODO: FIXME: Should be merged to mgmt.
 type Config struct {
 	IsDarwin bool
-	// Current working directory, at xxx/oryx/platform or xxx/srs-stack/platform.
+	// Current working directory, at xxx/oryx/platform.
 	Pwd string
 
 	Cloud    string

releases/Dockerfile

@@ -10,8 +10,8 @@ RUN make
 #FROM ${ARCH}ubuntu:focal AS dist
 FROM ${ARCH}ubuntu:focal AS dist
 
-COPY --from=build /g/releases/releases /usr/local/srs-stack/releases/releases
+COPY --from=build /g/releases/releases /usr/local/oryx/releases/releases
 
 ENV PORT=":9000"
-WORKDIR /usr/local/srs-stack/releases
+WORKDIR /usr/local/oryx/releases
 CMD ["./releases"]

scripts/setup-aapanel/do_install.sh

@@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
 install_path=/www/server/panel/plugin/oryx
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 DATA_HOME=/data
 
 # Update sysctl.conf and add if not exists. For example:
@@ -84,7 +84,7 @@ Uninstall() {
   fi
   echo "Remove oryx.service ok"
 
-  INSTALL_HOME=/usr/local/srs-stack
+  INSTALL_HOME=/usr/local/oryx
   rm -rf $INSTALL_HOME
   echo "Remove install $INSTALL_HOME ok"
 

scripts/setup-aapanel/do_setup.sh

@@ -11,7 +11,7 @@ NGINX_PID=
 WWW_HOME=
 SITE_NAME=
 install_path=/www/server/panel/plugin/oryx
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 DATA_HOME=/data
 
 HELP=no

scripts/setup-aapanel/init.d.sh

@@ -10,7 +10,7 @@
 # Description:       https://github.com/ossrs/oryx
 ### END INIT INFO
 
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 
 start() {
   systemctl start oryx.service

scripts/setup-aapanel/oryx_main.py

@@ -23,7 +23,7 @@ class oryx_main:
     #       public.get_vhost_path() is /www/server/panel/vhost
     __plugin_path = "{}/panel/plugin/oryx".format(public.get_setup_path())
     __srs_service = "/usr/lib/systemd/system/oryx.service"
-    __srs_home = '/usr/local/srs-stack'
+    __srs_home = '/usr/local/oryx'
     __r0_file = '/tmp/oryx_install.r0'
     __firewall = '/tmp/oryx_install.fw'
     __log_file = '/tmp/oryx_install.log'

scripts/setup-bt/do_install.sh

@@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:~/bin
 export PATH
 
 install_path=/www/server/panel/plugin/oryx
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 DATA_HOME=/data
 
 # Update sysctl.conf and add if not exists. For example:
@@ -84,7 +84,7 @@ Uninstall() {
   fi
   echo "Remove oryx.service ok"
 
-  INSTALL_HOME=/usr/local/srs-stack
+  INSTALL_HOME=/usr/local/oryx
   rm -rf $INSTALL_HOME
   echo "Remove install $INSTALL_HOME ok"
 

scripts/setup-bt/do_setup.sh

@@ -11,7 +11,7 @@ NGINX_PID=
 WWW_HOME=
 SITE_NAME=
 install_path=/www/server/panel/plugin/oryx
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 DATA_HOME=/data
 
 HELP=no

scripts/setup-bt/init.d.sh

@@ -10,7 +10,7 @@
 # Description:       https://github.com/ossrs/oryx
 ### END INIT INFO
 
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 
 start() {
   systemctl start oryx.service

scripts/setup-bt/oryx_main.py

@@ -23,7 +23,7 @@ class oryx_main:
     #       public.get_vhost_path() is /www/server/panel/vhost
     __plugin_path = "{}/panel/plugin/oryx".format(public.get_setup_path())
     __srs_service = "/usr/lib/systemd/system/oryx.service"
-    __srs_home = '/usr/local/srs-stack'
+    __srs_home = '/usr/local/oryx'
     __r0_file = '/tmp/oryx_install.r0'
     __firewall = '/tmp/oryx_install.fw'
     __log_file = '/tmp/oryx_install.log'

scripts/setup-droplet/scripts/01-srs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # The main directory.
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 DATA_HOME=/data
 IMAGE_URL=docker.io/ossrs/oryx:v${application_version}
 echo "SRS_HOME=$SRS_HOME, DATA_HOME=$DATA_HOME, IMAGE_URL=$IMAGE_URL"

scripts/setup-lighthouse/setup_lighthouse.sh

@@ -26,7 +26,7 @@ echo "Run setup at $WORK_DIR from $0"
 cd $WORK_DIR
 
 # The main directory.
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 DATA_HOME=/data
 IMAGE_URL=registry.cn-hangzhou.aliyuncs.com/ossrs/oryx:5
 SOURCE=$WORK_DIR

scripts/setup-ubuntu/init.d.sh

@@ -10,7 +10,7 @@
 # Description:       https://github.com/ossrs/oryx
 ### END INIT INFO
 
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 
 start() {
   systemctl start oryx.service

scripts/setup-ubuntu/install.sh

@@ -8,7 +8,7 @@ echo "BASH_SOURCE=${BASH_SOURCE}, REALPATH=${REALPATH}, SCRIPT_DIR=${SCRIPT_DIR}
 cd ${WORK_DIR}
 
 DATA_HOME=/data
-SRS_HOME=/usr/local/srs-stack
+SRS_HOME=/usr/local/oryx
 
 HELP=no
 VERBOSE=no

scripts/setup-ubuntu/uninstall.sh

@@ -24,7 +24,7 @@ if [[ -f /usr/lib/systemd/system/oryx.service ]]; then
     echo "Remove oryx.service ok"
 fi
 
-INSTALL_HOME=/usr/local/srs-stack
+INSTALL_HOME=/usr/local/oryx
 rm -rf $INSTALL_HOME
 echo "Remove install $INSTALL_HOME ok"
 

ui/src/pages/Contact.js

@@ -5,7 +5,7 @@
 //
 import React from "react";
 import {Container, Carousel} from "react-bootstrap";
-import srsStack from "../resources/srs-stack-1296x648.png";
+import srsStack from "../resources/oryx-1296x648.png";
 import srsVideo from "../resources/srs-xingqiu-1296x648.png";
 import {useSrsLanguage} from "../components/LanguageSwitch";
 

ui/src/resources/srs-stack-1296x648.png renamed to ui/src/resources/oryx-1296x648.png

@@ -6,7 +6,7 @@ Wants=docker.service
 [Service]
 Type=simple
 Restart=always
-ExecStart=/usr/local/srs-stack/mgmt/bootstrap
+ExecStart=/usr/local/oryx/mgmt/bootstrap
 KillSignal=SIGTERM
 TimeoutStopSec=30
 SendSIGKILL=yes