diff --git a/debian/install b/debian/install index 235ce3d..8cbabfd 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,4 @@ omr-admin-config.json usr/share/omr-admin omr-admin.py usr/bin -debian/omr-admin.service lib/systemd/system \ No newline at end of file +debian/omr-admin.service lib/systemd/system +debian/omr-admin-ipv6.service lib/systemd/system diff --git a/debian/omr-admin-ipv6.service b/debian/omr-admin-ipv6.service new file mode 100644 index 0000000..9af8b55 --- /dev/null +++ b/debian/omr-admin-ipv6.service @@ -0,0 +1,12 @@ +[Unit] +Description=OMR-Admin IPv6 +After=network.target network-online.target + +[Service] +Type=simple +Restart=always +ExecStart=/usr/local/bin/omr-admin.py --host="::" +CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN CAP_IPC_LOCK CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE CAP_FOWNER CAP_SETFCAP + +[Install] +WantedBy=multi-user.target diff --git a/debian/omr-admin.service b/debian/omr-admin.service index cb51a16..ba30724 100644 --- a/debian/omr-admin.service +++ b/debian/omr-admin.service @@ -5,8 +5,8 @@ After=network.target network-online.target [Service] Type=simple Restart=always -ExecStart=/usr/bin/omr-admin.py -CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW +ExecStart=/usr/local/bin/omr-admin.py +CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW CAP_SYS_ADMIN CAP_IPC_LOCK CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CAP_DAC_OVERRIDE CAP_FOWNER CAP_SETFCAP [Install] WantedBy=multi-user.target diff --git a/debian/postinst b/debian/postinst index 594552e..a8e21a8 100644 --- a/debian/postinst +++ b/debian/postinst @@ -11,15 +11,15 @@ OMR_ADMIN_PASS=$(od -vN "32" -An -tx1 /dev/urandom | tr '[:lower:]' '[:upper:]' # use debconf . /usr/share/debconf/confmodule -pip3 -q install fastapi netjsonconfig python-multipart -U +pip3 -q install fastapi jsonschema netjsonconfig python-multipart jinja2 -U -if [ ! -f "/etc/openmptcprouter-vps-admin/omr-admin-config.json" ]; then - mkdir -p /etc/openmptcprouter-vps-admin - cp /usr/share/omr-admin/omr-admin-config.json /etc/openmptcprouter-vps-admin/omr-admin-config.json - sed -i "s:AdminMySecretKey:$OMR_API_PASS:g" /etc/openmptcprouter-vps-admin/omr-admin-config.json - sed -i "s:MySecretKey:$OMR_ADMIN_PASS:g" /etc/openmptcprouter-vps-admin/omr-admin-config.json - openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -keyout /etc/openmptcprouter-vps-admin/key.pem -out /etc/openmptcprouter-vps-admin/cert.pem -subj "/C=US/ST=Oregon/L=Portland/O=OpenMPTCProuterVPS/OU=Org/CN=www.openmptcprouter.vps" -fi +#if [ ! -f "/etc/openmptcprouter-vps-admin/omr-admin-config.json" ]; then +# mkdir -p /etc/openmptcprouter-vps-admin +# cp /usr/share/omr-admin/omr-admin-config.json /etc/openmptcprouter-vps-admin/omr-admin-config.json +# sed -i "s:AdminMySecretKey:$OMR_API_PASS:g" /etc/openmptcprouter-vps-admin/omr-admin-config.json +# sed -i "s:MySecretKey:$OMR_ADMIN_PASS:g" /etc/openmptcprouter-vps-admin/omr-admin-config.json +# openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -keyout /etc/openmptcprouter-vps-admin/key.pem -out /etc/openmptcprouter-vps-admin/cert.pem -subj "/C=US/ST=Oregon/L=Portland/O=OpenMPTCProuterVPS/OU=Org/CN=www.openmptcprouter.vps" +#fi systemctl enable omr-admin.service systemctl restart omr-admin.service