diff --git a/compose.bash b/.recycle/compose.bash similarity index 100% rename from compose.bash rename to .recycle/compose.bash diff --git a/5ed8bb34-a0d2-44e6-91c4-9505f99306c1.devvv b/5ed8bb34-a0d2-44e6-91c4-9505f99306c1.devvv new file mode 100644 index 0000000..e69de29 diff --git a/Dockerfile b/Dockerfile index c219b8a..427d46a 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM softwareshinobi/valorant-digital-desktop:pristine AS desktopBase +FROM softwareshinobi/shinobi-academy-desktop AS desktopBase ## @@ -40,6 +40,10 @@ COPY ping.script /tmp/ping.bash RUN chmod +x /tmp/ping.bash +COPY ping2.script /tmp/ping2.bash + +RUN chmod +x /tmp/ping2.bash + RUN ls -lha /tmp/ #### diff --git a/compose.yaml b/compose.yaml index ffb9648..320e1b2 100755 --- a/compose.yaml +++ b/compose.yaml @@ -22,9 +22,9 @@ services: volumes: - - /tmp/volumes/yankee/desktop:/home/shinobi + - /tmp/v2olumes/yankee/desktop:/root - hostname: yankeedownload + hostname: rootsitaution domainname: desktop.yankee.embaNET.online @@ -44,7 +44,7 @@ services: USER_GID: 1000 - USER: yankee + USER: root PASSWORD: yankee diff --git a/cronfile b/cronfile index d03f4b2..f66b4ac 100644 --- a/cronfile +++ b/cronfile @@ -1,3 +1,7 @@ * * * * * root /tmp/ping.bash >> /var/log/cron.log 2>&1 -* * * * * /tmp/ping.bash >> /var/log/cron.log 2>&1 +* * * * * python3 /yankee-gnome-fire-consumer/consumer.py >> /var/log/yankee-downloader.log 2>&1 + +* * * * * /tmp/ping2.bash >> /var/log/cron.log 2>&1 + + diff --git a/ping2.script b/ping2.script new file mode 100644 index 0000000..2a9e091 --- /dev/null +++ b/ping2.script @@ -0,0 +1,3 @@ +touch /tmp/`date +%Y_%m_%d_%H_%M_%S`.22222dat + +ls -lha /tmp/*dat diff --git a/provision/installs/gnomedownloader.bash b/provision/installs/gnomedownloader.bash index 51f54a5..40bce56 100755 --- a/provision/installs/gnomedownloader.bash +++ b/provision/installs/gnomedownloader.bash @@ -1,7 +1,7 @@ #!/bin/bash echo "##" -echo "## launch > yankee > downloader node provisioning" +echo "## launch > yankee > downloader node provision" echo "##" apt update @@ -14,34 +14,4 @@ pip install stomp.py pip install selenium -## for rest situations - pip install requests - -## - -#### - -cd / - -git clone https://code.yankee.embanet.online/yankee/yankee-gnome-fire-consumer.git - -chmod 777 yankee-gnome-fire-consumer -R - -cd yankee-gnome-fire-consumer - -chmod +x *.bash - -chmod +x *.sh - -bash provision.bash - -pppwd=`pwd` - -echo " dir / "$pppwd - -##echo "python3 $pppwd/consumer.py" | at now + 1 minutes - -##echo "/yankee/go.sh" | at now + 10 minutes - -#### \ No newline at end of file diff --git a/provision/startup/startup.sh b/provision/startup/startup.sh index 68fdfbd..b65a2fd 100755 --- a/provision/startup/startup.sh +++ b/provision/startup/startup.sh @@ -94,6 +94,26 @@ service cron status #### + +#### + +cd / + +rm -rf /yankee-gnome-fire-consumer + +git clone https://code.yankee.embanet.online/yankee/yankee-gnome-fire-consumer.git + +chmod 777 yankee-gnome-fire-consumer -R + +cd yankee-gnome-fire-consumer + +chmod +x *.bash + +chmod +x *.sh + +#### + + exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf touch /tmp/prince-trunks-has-returned-after diff --git a/touch b/touch new file mode 100644 index 0000000..e69de29