git clone https://github.com/z3apa3a/3proxy cd 3proxy ln -s Makefile.Linux Makefile make sudo make install +Default configuration (for Linux/Unix): 3proxy uses 2 configuration files: @@ -58,15 +59,59 @@ usage: /etc/3proxy/conf/add3proxyuser.sh username password [day_limit] [bandwidt or modify /etc/3proxy/conf/ files directly. + +With CMake: +
+git clone https://github.com/z3apa3a/3proxy +cd 3proxy +mkdir build && cd build +cmake .. +cmake --build . +sudo cmake --install . ++ +CMake does not use chroot configuration, config file is /etc/3proxy/3proxy.cfg + * For MacOS X / FreeBSD / *BSD +With Makefile: +
git clone https://github.com/z3apa3a/3proxy cd 3proxy ln -s Makefile.FreeBSD Makefile make +(binaries are in bin/ directory) +With CMake (recommended): +
+git clone https://github.com/z3apa3a/3proxy +cd 3proxy +mkdir build && cd build +cmake .. +cmake --build . +sudo cmake --install . ++ +This installs binaries to /usr/local/bin/, configuration to /etc/3proxy/, +plugins to /usr/local/lib/3proxy/, rc scripts to rc.d for BSD and launchd plist to /Library/LaunchDaemons/ for MacOS. + +Service management on macOS: +
+# Load and start service +sudo launchctl load /Library/LaunchDaemons/org.3proxy.3proxy.plist + +# Stop service +sudo launchctl stop org.3proxy.3proxy + +# Start service +sudo launchctl start org.3proxy.3proxy + +# Unload and disable service +sudo launchctl unload /Library/LaunchDaemons/org.3proxy.3proxy.plist ++ Features: 1. General + IPv6 support for incoming and outgoing connection, diff --git a/doc/html/howtoe.html b/doc/html/howtoe.html index 60c9358..cbeb0e6 100644 --- a/doc/html/howtoe.html +++ b/doc/html/howtoe.html @@ -12,6 +12,7 @@
+Using CMake (recommended): +
+mkdir build && cd build +cmake .. +cmake --build . +sudo cmake --install . ++This installs: +
/usr/local/bin//etc/3proxy//usr/local/lib/3proxy//Library/LaunchDaemons/org.3proxy.3proxy.plist+Using Makefile: +
+ln -sf Makefile.FreeBSD Makefile +make +sudo make install ++This installs binaries to
/usr/local/3proxy/bin/ and configuration to /usr/local/etc/3proxy/.
+
+
+Service management with launchd:
+
After installation via cmake, the service can be managed with launchctl:
+
+# Load and start the service +sudo launchctl load /Library/LaunchDaemons/org.3proxy.3proxy.plist + +# Stop the service +sudo launchctl stop org.3proxy.3proxy + +# Start the service +sudo launchctl start org.3proxy.3proxy + +# Unload and disable the service +sudo launchctl unload /Library/LaunchDaemons/org.3proxy.3proxy.plist ++The service runs as user
proxy (created during installation).
+Configuration file: /etc/3proxy/3proxy.cfg
diff --git a/doc/html/howtor.html b/doc/html/howtor.html index 1be2b14..6433c6b 100644 --- a/doc/html/howtor.html +++ b/doc/html/howtor.html @@ -12,6 +12,7 @@
+ С помощью CMake (рекомендуется): +
+ mkdir build && cd build + cmake .. + cmake --build . + sudo cmake --install .+ Это установит: +
/usr/local/bin//etc/3proxy//usr/local/lib/3proxy//Library/LaunchDaemons/org.3proxy.3proxy.plist+ С помощью Makefile: +
+ ln -sf Makefile.FreeBSD Makefile + make + sudo make install+ Это установит исполняемые файлы в
/usr/local/3proxy/bin/ и конфигурацию в /usr/local/etc/3proxy/.
+
+
+ Управление службой через launchd:
+
После установки через cmake службой можно управлять с помощью launchctl:
+
+ # Загрузить и запустить службу + sudo launchctl load /Library/LaunchDaemons/org.3proxy.3proxy.plist + + # Остановить службу + sudo launchctl stop org.3proxy.3proxy + + # Запустить службу + sudo launchctl start org.3proxy.3proxy + + # Выгрузить и отключить службу + sudo launchctl unload /Library/LaunchDaemons/org.3proxy.3proxy.plist+ Служба запускается от имени пользователя
proxy (создаётся при установке).
+ Файл конфигурации: /etc/3proxy/3proxy.cfg
+
Использование готовых образов из GitHub Container Registry:
diff --git a/scripts/3proxy.cfg b/scripts/3proxy.cfg
index 74b6342..660467b 100644
--- a/scripts/3proxy.cfg
+++ b/scripts/3proxy.cfg
@@ -1,2 +1,4 @@
#!/usr/local/bin/3proxy
-#path to plugins:
\ No newline at end of file
+
+#use standard syslog logging
+log @3proxy
diff --git a/scripts/3proxy.service.in b/scripts/3proxy.service.in
index 52a73b2..917e088 100644
--- a/scripts/3proxy.service.in
+++ b/scripts/3proxy.service.in
@@ -4,6 +4,9 @@ Documentation=man:3proxy(1)
After=network.target
[Service]
+Type=simple
+User=proxy
+Group=proxy
Environment=CONFIGFILE=/etc/3proxy/3proxy.cfg
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/3proxy ${CONFIGFILE}
ExecReload=/bin/kill -SIGUSR1 $MAINPID
@@ -13,6 +16,7 @@ RestartSec=60s
LimitNOFILE=65536
LimitNPROC=32768
RuntimeDirectory=3proxy
+RuntimeDirectoryMode=0755
[Install]
WantedBy=multi-user.target
diff --git a/scripts/3proxy.tmpfiles.in b/scripts/3proxy.tmpfiles.in
index a2f7ed4..a021fc3 100644
--- a/scripts/3proxy.tmpfiles.in
+++ b/scripts/3proxy.tmpfiles.in
@@ -1,3 +1,3 @@
# tmpfiles.d configuration for 3proxy
# This creates the runtime directory for 3proxy
-d /run/3proxy 0755 root root -
+d /run/3proxy 0755 proxy proxy -
diff --git a/scripts/init.d/3proxy.in b/scripts/init.d/3proxy.in
new file mode 100644
index 0000000..494ec08
--- /dev/null
+++ b/scripts/init.d/3proxy.in
@@ -0,0 +1,109 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: 3proxy
+# Required-Start: $network $local_fs
+# Required-Stop: $network $local_fs
+# Should-Start:
+# Should-Stop:
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Start/stop 3proxy
+# Description: Start/stop 3proxy, tiny proxy server
+### END INIT INFO
+# chkconfig: 2345 20 80
+# description: 3proxy tiny proxy server
+
+DAEMON=@CMAKE_INSTALL_FULL_BINDIR@/3proxy
+CONFIGFILE=/etc/3proxy/3proxy.cfg
+PIDFILE=/var/run/3proxy/3proxy.pid
+USER=proxy
+GROUP=proxy
+
+# Source function library if available
+if [ -f /etc/init.d/functions ]; then
+ . /etc/init.d/functions
+fi
+
+case "$1" in
+ start)
+ echo -n "Starting 3Proxy: "
+
+ if [ ! -d /var/run/3proxy ]; then
+ mkdir -p /var/run/3proxy
+ chown $USER:$GROUP /var/run/3proxy 2>/dev/null || true
+ fi
+
+ if command -v start-stop-daemon >/dev/null 2>&1; then
+ # Debian/Ubuntu style
+ start-stop-daemon --start --quiet --pidfile $PIDFILE \
+ --chuid $USER:$GROUP --exec $DAEMON -- $CONFIGFILE
+ elif [ -f /etc/init.d/functions ]; then
+ # RedHat/CentOS style
+ daemon --user=$USER $DAEMON $CONFIGFILE
+ else
+ # Fallback
+ su -s /bin/sh $USER -c "$DAEMON $CONFIGFILE"
+ fi
+
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && touch /var/lock/subsys/3proxy
+ ;;
+
+ stop)
+ echo -n "Stopping 3Proxy: "
+
+ if command -v start-stop-daemon >/dev/null 2>&1; then
+ # Debian/Ubuntu style
+ start-stop-daemon --stop --quiet --pidfile $PIDFILE
+ elif [ -f /etc/init.d/functions ]; then
+ # RedHat/CentOS style
+ killproc -p $PIDFILE $DAEMON
+ else
+ # Fallback
+ if [ -f $PIDFILE ]; then
+ kill `cat $PIDFILE` 2>/dev/null
+ else
+ killall 3proxy 2>/dev/null
+ fi
+ fi
+
+ RETVAL=$?
+ echo
+ [ $RETVAL = 0 ] && rm -f /var/lock/subsys/3proxy
+ ;;
+
+ restart|reload)
+ echo -n "Reloading 3Proxy: "
+ if [ -f $PIDFILE ]; then
+ kill -s USR1 `cat $PIDFILE` 2>/dev/null
+ RETVAL=$?
+ else
+ echo "PID file not found, cannot reload"
+ RETVAL=1
+ fi
+ echo
+ ;;
+
+ status)
+ if command -v status >/dev/null 2>&1; then
+ status -p $PIDFILE $DAEMON
+ elif [ -f $PIDFILE ]; then
+ if kill -0 `cat $PIDFILE` 2>/dev/null; then
+ echo "3proxy is running (pid `cat $PIDFILE`)"
+ RETVAL=0
+ else
+ echo "3proxy is dead but pid file exists"
+ RETVAL=1
+ fi
+ else
+ echo "3proxy is not running"
+ RETVAL=3
+ fi
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|reload|status}"
+ exit 1
+esac
+exit ${RETVAL:-0}
diff --git a/scripts/org.3proxy.3proxy.plist.in b/scripts/org.3proxy.3proxy.plist.in
new file mode 100644
index 0000000..1e53129
--- /dev/null
+++ b/scripts/org.3proxy.3proxy.plist.in
@@ -0,0 +1,35 @@
+
+
+