diff --git a/bin/build.sh b/bin/build.sh index 367a090..379cab1 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -173,7 +173,8 @@ pre_cproxy_build() { mkdir -p $deb_build_dir/usr/local/subsManage mkdir -p $deb_build_dir/usr/local/backup - mkdir -p $deb_build_dir/usr/local/restproxy/bin/conf/default + mkdir -p $deb_build_dir/usr/local/restproxy/bin + mkdir -p $deb_build_dir/usr/local/restproxy/conf/default mkdir -p $deb_build_dir/usr/local/restproxy/log mkdir -p $deb_build_dir/lib/systemd/system @@ -185,7 +186,8 @@ pre_goproxy_build() { mkdir -p $deb_build_dir/usr/local/subsManage mkdir -p $deb_build_dir/usr/local/backup - mkdir -p $deb_build_dir/usr/local/restproxy/bin/conf/default + mkdir -p $deb_build_dir/usr/local/restproxy/bin + mkdir -p $deb_build_dir/usr/local/restproxy/etc/default mkdir -p $deb_build_dir/usr/local/restproxy/log mkdir -p $deb_build_dir/lib/systemd/system @@ -256,7 +258,7 @@ case $pkg_type in src_pkg_dir=$src_pkg_root/cproxy cp $proxy_bin_dir/$cproxy_bin_file $deb_build_dir/usr/local/restproxy/bin/restproxy - cp -rf $src_pkg_dir/conf/* $deb_build_dir/usr/local/restproxy/bin/conf/default + cp -rf $src_pkg_dir/conf/* $deb_build_dir/usr/local/restproxy/conf/default cp $src_pkg_dir/systemd/restproxy.service $deb_build_dir/lib/systemd/system cp $src_pkg_dir/DEBIAN/* $deb_build_dir/DEBIAN @@ -273,7 +275,7 @@ case $pkg_type in src_pkg_dir=$src_pkg_root/goproxy cp $proxy_bin_dir/$goproxy_bin_file $deb_build_dir/usr/local/restproxy/bin/restproxy - cp -rf $src_pkg_dir/conf/* $deb_build_dir/usr/local/restproxy/bin/conf/default + cp -rf $src_pkg_dir/conf/* $deb_build_dir/usr/local/restproxy/etc/default cp $src_pkg_dir/systemd/restproxy.service $deb_build_dir/lib/systemd/system cp $src_pkg_dir/DEBIAN/* $deb_build_dir/DEBIAN diff --git a/pkg/cproxy/DEBIAN/postinst b/pkg/cproxy/DEBIAN/postinst index 019b045..e535ac7 100755 --- a/pkg/cproxy/DEBIAN/postinst +++ b/pkg/cproxy/DEBIAN/postinst @@ -2,6 +2,7 @@ test ! -f /usr/local/restproxy/conf/rest_proxy.conf && cp -rf /usr/local/restproxy/conf/default/* /usr/local/restproxy/conf +systemctl daemon-reload systemctl enable restproxy exit 0 diff --git a/pkg/cproxy/systemd/restproxy.service b/pkg/cproxy/systemd/restproxy.service index 62e220e..19ca401 100755 --- a/pkg/cproxy/systemd/restproxy.service +++ b/pkg/cproxy/systemd/restproxy.service @@ -1,7 +1,7 @@ [Service] Type=idle WorkingDirectory=/usr/local/restproxy -ExecStart=/usr/local/restproxy/restproxy -r 1 > /dev/null 2>&1 & +ExecStart=/usr/local/restproxy/bin/restproxy -r 1 > /dev/null 2>&1 & Restart=always RestartSec=3 StandardOutput=null diff --git a/pkg/goproxy/DEBIAN/postinst b/pkg/goproxy/DEBIAN/postinst index 019b045..816496f 100755 --- a/pkg/goproxy/DEBIAN/postinst +++ b/pkg/goproxy/DEBIAN/postinst @@ -1,7 +1,8 @@ #!/bin/bash -test ! -f /usr/local/restproxy/conf/rest_proxy.conf && cp -rf /usr/local/restproxy/conf/default/* /usr/local/restproxy/conf +test ! -f /usr/local/restproxy/etc/config.yaml && cp -rf /usr/local/restproxy/etc/default/* /usr/local/restproxy/etc +systemctl daemon-reload systemctl enable restproxy exit 0 diff --git a/pkg/goproxy/systemd/restproxy.service b/pkg/goproxy/systemd/restproxy.service index 62e220e..19ca401 100755 --- a/pkg/goproxy/systemd/restproxy.service +++ b/pkg/goproxy/systemd/restproxy.service @@ -1,7 +1,7 @@ [Service] Type=idle WorkingDirectory=/usr/local/restproxy -ExecStart=/usr/local/restproxy/restproxy -r 1 > /dev/null 2>&1 & +ExecStart=/usr/local/restproxy/bin/restproxy -r 1 > /dev/null 2>&1 & Restart=always RestartSec=3 StandardOutput=null