From 4034d39610c213616972f4f00e2e8d818b2727f7 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 12 Mar 2026 06:04:15 +0300 Subject: [PATCH] update ignored files --- oxidized/Dockerfile | 68 --------------------------------------- oxidized/config/config | 56 -------------------------------- oxidized/config/oxidized | 56 -------------------------------- oxidized/config/router.db | 3 -- oxidized/run.sh | 15 --------- 5 files changed, 198 deletions(-) delete mode 100644 oxidized/Dockerfile delete mode 100644 oxidized/config/config delete mode 100644 oxidized/config/oxidized delete mode 100644 oxidized/config/router.db delete mode 100644 oxidized/run.sh diff --git a/oxidized/Dockerfile b/oxidized/Dockerfile deleted file mode 100644 index d351be6..0000000 --- a/oxidized/Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM reg.vados.ru/debian:trixie-slim - -##### Place "static" commands at the beginning to optimize image size and build speed - -# add non-privileged user -RUN groupadd -g "36258" -r oxidized && \ - useradd -u "1002" -r -m -d /home/oxidized -g oxidized oxidized && \ - chsh -s /bin/bash oxidized - -# See PR #3637 - ruby runs /bin/sh and bash is whished for exec hooks -RUN ln -sf /bin/bash /bin/sh - -##### MSMTP - Sending emails -# link config for msmtp for easier use. -# /home/oxidized/.msmtprc is a symbolic link to /home/oxidized/.config/oxidized/.msmtprc -# Create the files as the user oxidized -RUN mkdir -p /home/oxidized/.config/oxidized/ && \ - touch /home/oxidized/.config/oxidized/.msmtprc && \ - ln -s /home/oxidized/.config/oxidized/.msmtprc /home/oxidized/ && \ - chmod -R ug=rwX,o= /home/oxidized/.config/ && \ - chown -R oxidized:oxidized /home/oxidized/ - -# add runit services -COPY build/extra/oxidized.runit /etc/service/oxidized/run -COPY build/extra/auto-reload-config.runit /etc/service/auto-reload-config/run -COPY build/extra/update-ca-certificates.runit /etc/service/update-ca-certificates/run - -ADD config/mc.tar.gz /root/.config -ADD config/mc.tar.gz /home/oxidized/.config - -# Prepare the build of oxidized, copy our working directory in the container -COPY build/. /tmp/oxidized/ -WORKDIR /tmp/oxidized - -# set up dependencies for the build process -RUN set -eux; export DEBIAN_FRONTEND=noninteractive; apt-get update; -# no apt-get upgrade needed, as debian images are rebuilt on security issues - -# runit: lightweight service supervisor -# dumb-init: proper PID 1 signal handling -# gosu: run oxidized as the user oxidized -# Build tools -RUN set -eux; export DEBIAN_FRONTEND=noninteractive; apt-get install -y --no-install-recommends runit dumb-init gosu build-essential ruby-dev openssh-client vim-tiny inetutils-telnet curl jq \ - git git-email \ - libmailtools-perl msmtp \ - ruby ruby-rugged ruby-slop ruby-net-telnet ruby-net-ssh ruby-net-ftp ruby-ed25519 ruby-net-scp \ - ruby-net-http-persistent ruby-mechanize ruby-sqlite3 ruby-mysql2 ruby-pg ruby-sequel ruby-gpgme\ - ruby-aws-sdk ruby-xmpp4r ruby-charlock-holmes ruby-haml ruby-htmlentities ruby-json \ - puma ruby-sinatra ruby-sinatra-contrib ruby-faraday ruby-faraday-net-http ruby-faraday-multipart ruby-hashie ruby-concurrent mc; - -# build & install oxidized from the working repository -# docker automated build gets shallow copy, but non-shallow copy cannot be unshallowed -RUN set -eux; export DEBIAN_FRONTEND=noninteractive; git fetch --unshallow || true; rake install; - -# install oxidized-web and gems not available in debian trixie -RUN set -eux; export DEBIAN_FRONTEND=noninteractive; gem install --no-document --no-wrappers --conservative --minimal-deps oxidized-web slack-ruby-client cisco_spark net-tftp x25519; -RUN set -eux; export DEBIAN_FRONTEND=noninteractive; apt-get remove -y build-essential ruby-dev; apt-get autoremove -y ; apt-get clean; -RUN set -eux; export DEBIAN_FRONTEND=noninteractive; rm -rf /var/lib/apt/lists/*; find /var/lib/gems/*/cache -mindepth 1 -delete; rm -rf /tmp/oxidized; - -WORKDIR / - -EXPOSE 88/tcp - -# dumb-init handles PID 1 for proper signal forwarding (Ctrl-C, SIGTERM) -ENTRYPOINT ["/usr/bin/dumb-init", "--"] - -# runit supervises all services in /etc/service/ -CMD ["runsvdir", "-P", "/etc/service"] diff --git a/oxidized/config/config b/oxidized/config/config deleted file mode 100644 index 3097947..0000000 --- a/oxidized/config/config +++ /dev/null @@ -1,56 +0,0 @@ -username: mikro_bak -password: peskar55 -model: routeros -resolve_dns: true -# Interval to renew cofigs devices -interval: 14400 -use_syslog: false -debug: false -run_once: false -threads: 30 -use_max_threads: false -timeout: 20 -retries: 3 -prompt: !ruby/regexp /^([\w.@-]+[#>]\s?)$/ -rest: 0.0.0.0:88 -next_adds_job: false -vars: {} -groups: {} -group_map: {} -models: {} -pid: "/var/www/ros.vados.ru/Mikrotiks/oxidized/config/pid" -crash: - directory: "/var/www/ros.vados.ru/Mikrotiks/oxidized/config/crashes" - hostnames: false -stats: - history_size: 10 -input: - default: ssh - debug: false - ssh: - secure: false - ftp: - passive: true - utf8_encoded: true -output: - default: git - git: - user: amster-dev - email: vados@vados.ru - repo: "/oxidized/config/devices.git" -source: - default: csv - csv: - file: "/var/www/ros.vados.ru/Mikrotiks/oxidized/config/router.db" - delimiter: !ruby/regexp /:/ - map: - name: 0 - model: 1 - ip: 2 - port: 3 - username: 4 - password: 5 - gpg: false -model_map: - juniper: junos - cisco: ios diff --git a/oxidized/config/oxidized b/oxidized/config/oxidized deleted file mode 100644 index 55df181..0000000 --- a/oxidized/config/oxidized +++ /dev/null @@ -1,56 +0,0 @@ -username: mikro_bak -password: peskar55 -model: routeros -resolve_dns: true -# Interval to renew cofigs devices -interval: 14400 -use_syslog: false -debug: false -run_once: false -threads: 30 -use_max_threads: false -timeout: 20 -retries: 3 -prompt: !ruby/regexp /^([\w.@-]+[#>]\s?)$/ -rest: 0.0.0.0:88 -next_adds_job: false -vars: {} -groups: {} -group_map: {} -models: {} -pid: "/opt/docker/oxidized/.config/pid" -crash: - directory: "/opt/docker/oxidized/.config/crashes" - hostnames: false -stats: - history_size: 10 -input: - default: ssh - debug: false - ssh: - secure: false - ftp: - passive: true - utf8_encoded: true -output: - default: git - git: - user: amster-dev - email: vados@vados.ru - repo: "/oxidized/.config/devices.git" -source: - default: csv - csv: - file: "/opt/docker/oxidized/.config/router.db" - delimiter: !ruby/regexp /:/ - map: - name: 0 - model: 1 - ip: 2 - port: 3 - username: 4 - password: 5 - gpg: false -model_map: - juniper: junos - cisco: ios diff --git a/oxidized/config/router.db b/oxidized/config/router.db deleted file mode 100644 index 749ba96..0000000 --- a/oxidized/config/router.db +++ /dev/null @@ -1,3 +0,0 @@ -MikroNUC:routeros:10.30.30.10:2222:mikro_bak:Peskar55 -MikroMaster:routeros:10.30.30.81:2222:mikro_bak:Peskar55 -MikroYellow:routeros:10.30.30.86:2222:mikro_bak:Peskar55 diff --git a/oxidized/run.sh b/oxidized/run.sh deleted file mode 100644 index 1b596bf..0000000 --- a/oxidized/run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -#--project-name=amster-registry -#docker network create -d bridge --attachable registry-ui-net - -#docker compose up -d --rem -#docker compose registry-ui stop -#docker cp registry-ui:/etc/nginx/nginx.conf tmp.conf -#ls -l tmp.conf -#docker-compose logs registry-ui -#docker-compose build --pull -# --no-cache -#docker compose up -d -sudo docker run --rm -v ~/oxidized/oxidized-config:/home/oxidized/.config/oxidized reg.vados.ru/oxidized:lts su mikro_bak -c oxidized -#reg.vados.ru/oxidized:lts su - mikro_bak -c backups -#sudo docker run --rm -v ~/oxidized-config:/home/oxidized/.config/oxidized docker.io/oxidized/oxidized:latest su - oxidized -c oxidized -- 2.52.0