Remove backend.json from minion-vm, since it matches what is in minion-backend

This commit is contained in:
April King 2015-09-08 11:12:52 -05:00
Родитель f856ab584b
Коммит 4fd99f0c30
5 изменённых файлов: 1 добавлений и 22 удалений

Просмотреть файл

@ -9,7 +9,6 @@ EXPOSE 8383
RUN git clone https://github.com/mozilla/minion-backend.git ${MINION_BACKEND} RUN git clone https://github.com/mozilla/minion-backend.git ${MINION_BACKEND}
# Move files into place # Move files into place
COPY backend.json /tmp/backend.json
COPY scan.json /tmp/scan.json COPY scan.json /tmp/scan.json
COPY backend.sh /tmp/backend.sh COPY backend.sh /tmp/backend.sh

1
Vagrantfile поставляемый
Просмотреть файл

@ -55,7 +55,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# backend.vm.synced_folder BACKEND_PLUGIN_NMAP_SRC, BACKEND_PLUGIN_NMAP_DST, create: true # backend.vm.synced_folder BACKEND_PLUGIN_NMAP_SRC, BACKEND_PLUGIN_NMAP_DST, create: true
# Copy the configuration files into the VM # Copy the configuration files into the VM
backend.vm.provision "file", source: "backend.json", destination: "/tmp/backend.json"
backend.vm.provision "file", source: "scan.json", destination: "/tmp/scan.json" backend.vm.provision "file", source: "scan.json", destination: "/tmp/scan.json"
backend.vm.provision "shell" do |s| backend.vm.provision "shell" do |s|

Просмотреть файл

@ -1,18 +0,0 @@
{
"celery": {
"broker": "amqp://guest@127.0.0.1:5672//",
"backend": "amqp"
},
"mongodb": {
"host": "127.0.0.1",
"port": 27017
},
"api": {
"url": "http://0.0.0.0:8383"
},
"email": {
"host": "127.0.0.1",
"max_time_allowed": 604800,
"port": 25
}
}

Просмотреть файл

@ -34,7 +34,6 @@ python setup.py develop
# Configure minion-backend (listening on 0.0.0.0:8383, and with no blacklist) # Configure minion-backend (listening on 0.0.0.0:8383, and with no blacklist)
mkdir -p /etc/minion mkdir -p /etc/minion
mv /tmp/backend.json /etc/minion
mv /tmp/scan.json /etc/minion mv /tmp/scan.json /etc/minion
# Install minion-nmap-plugin; comment out `git clone` if working on minion-nmap-plugin locally # Install minion-nmap-plugin; comment out `git clone` if working on minion-nmap-plugin locally

Просмотреть файл

@ -33,4 +33,4 @@ useradd -m minion
install -m 700 -o minion -g minion -d /run/minion -d /var/lib/minion -d /var/log/minion -d ~minion/.python-eggs install -m 700 -o minion -g minion -d /run/minion -d /var/lib/minion -d /var/log/minion -d ~minion/.python-eggs
# Setup the minion environment for the minion user # Setup the minion environment for the minion user
echo -e "\n# Source minion-backend virtualenv\nsource ${MINION_BASE_DIRECTORY}/minion-env/bin/activate" >> ~minion/.profile echo -e "\n# Automatically source minion-backend virtualenv\nsource ${MINION_BASE_DIRECTORY}/minion-env/bin/activate" >> ~minion/.profile