From 405e0934c2299eea64fec613b638cf0985070513 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Sun, 10 Nov 2019 17:07:38 +0100 Subject: [PATCH] Changed folder structure (fixes #10) --- ansible.yml | 8 +++++--- {templates/quotes => quotes}/Che Guevara.csv | 0 {templates/quotes => quotes}/Frederick Engels/Others.csv | 0 .../Communist Manifesto.csv | 0 .../Karl Marx and Frederick Engels/Others.csv | 0 {templates/quotes => quotes}/Karl Marx/Capital.csv | 0 .../quotes => quotes}/Karl Marx/German Ideology.csv | 0 {templates/quotes => quotes}/Karl Marx/Others.csv | 0 {templates/quotes => quotes}/Karl Marx/The Grundrisse.csv | 0 .../On the Correct Handling of Contradictions.csv | 0 {templates/quotes => quotes}/Mao Zedong/Others.csv | 0 ...of the Chinese Communist Party in the National War.csv | 0 {templates/quotes => quotes}/Other Authors.csv | 0 {templates/quotes => quotes}/Rosa Luxemburg.csv | 0 .../Left-Wing Communism: An Infantile Disorder.csv | 0 {templates/quotes => quotes}/Vladimir Lenin/Others.csv | 0 .../Vladimir Lenin/State and Revolution.csv | 0 .../Vladimir Lenin/What Is To Be Done.csv | 0 {templates => src}/Dockerfile | 0 {templates => src}/main.py | 0 {templates => src}/requirements.txt | 0 21 files changed, 5 insertions(+), 3 deletions(-) rename {templates/quotes => quotes}/Che Guevara.csv (100%) rename {templates/quotes => quotes}/Frederick Engels/Others.csv (100%) rename {templates/quotes => quotes}/Karl Marx and Frederick Engels/Communist Manifesto.csv (100%) rename {templates/quotes => quotes}/Karl Marx and Frederick Engels/Others.csv (100%) rename {templates/quotes => quotes}/Karl Marx/Capital.csv (100%) rename {templates/quotes => quotes}/Karl Marx/German Ideology.csv (100%) rename {templates/quotes => quotes}/Karl Marx/Others.csv (100%) rename {templates/quotes => quotes}/Karl Marx/The Grundrisse.csv (100%) rename {templates/quotes => quotes}/Mao Zedong/On the Correct Handling of Contradictions.csv (100%) rename {templates/quotes => quotes}/Mao Zedong/Others.csv (100%) rename {templates/quotes => quotes}/Mao Zedong/The Role of the Chinese Communist Party in the National War.csv (100%) rename {templates/quotes => quotes}/Other Authors.csv (100%) rename {templates/quotes => quotes}/Rosa Luxemburg.csv (100%) rename {templates/quotes => quotes}/Vladimir Lenin/Left-Wing Communism: An Infantile Disorder.csv (100%) rename {templates/quotes => quotes}/Vladimir Lenin/Others.csv (100%) rename {templates/quotes => quotes}/Vladimir Lenin/State and Revolution.csv (100%) rename {templates/quotes => quotes}/Vladimir Lenin/What Is To Be Done.csv (100%) rename {templates => src}/Dockerfile (100%) rename {templates => src}/main.py (100%) rename {templates => src}/requirements.txt (100%) diff --git a/ansible.yml b/ansible.yml index c389a56..b77f0c9 100644 --- a/ansible.yml +++ b/ansible.yml @@ -17,10 +17,12 @@ - name: create folder for build files file: path=/tmp/communistquotes state=directory - # NOTE: It doesnt really make sense to call the folder "templates", when we actually dont use a - # template task... - name: copy all build files recursively - copy: src=templates/ dest=/tmp/communistquotes + copy: src={{ item.from }} dest={{ item.to }} + with_items: + # folder structure on the target server is intentionally different + - { from: 'src/', to: '/tmp/communistquotes' } + - { from: 'quotes/', to: '/tmp/communistquotes/quotes' } - name: Build image using cache source docker_image: diff --git a/templates/quotes/Che Guevara.csv b/quotes/Che Guevara.csv similarity index 100% rename from templates/quotes/Che Guevara.csv rename to quotes/Che Guevara.csv diff --git a/templates/quotes/Frederick Engels/Others.csv b/quotes/Frederick Engels/Others.csv similarity index 100% rename from templates/quotes/Frederick Engels/Others.csv rename to quotes/Frederick Engels/Others.csv diff --git a/templates/quotes/Karl Marx and Frederick Engels/Communist Manifesto.csv b/quotes/Karl Marx and Frederick Engels/Communist Manifesto.csv similarity index 100% rename from templates/quotes/Karl Marx and Frederick Engels/Communist Manifesto.csv rename to quotes/Karl Marx and Frederick Engels/Communist Manifesto.csv diff --git a/templates/quotes/Karl Marx and Frederick Engels/Others.csv b/quotes/Karl Marx and Frederick Engels/Others.csv similarity index 100% rename from templates/quotes/Karl Marx and Frederick Engels/Others.csv rename to quotes/Karl Marx and Frederick Engels/Others.csv diff --git a/templates/quotes/Karl Marx/Capital.csv b/quotes/Karl Marx/Capital.csv similarity index 100% rename from templates/quotes/Karl Marx/Capital.csv rename to quotes/Karl Marx/Capital.csv diff --git a/templates/quotes/Karl Marx/German Ideology.csv b/quotes/Karl Marx/German Ideology.csv similarity index 100% rename from templates/quotes/Karl Marx/German Ideology.csv rename to quotes/Karl Marx/German Ideology.csv diff --git a/templates/quotes/Karl Marx/Others.csv b/quotes/Karl Marx/Others.csv similarity index 100% rename from templates/quotes/Karl Marx/Others.csv rename to quotes/Karl Marx/Others.csv diff --git a/templates/quotes/Karl Marx/The Grundrisse.csv b/quotes/Karl Marx/The Grundrisse.csv similarity index 100% rename from templates/quotes/Karl Marx/The Grundrisse.csv rename to quotes/Karl Marx/The Grundrisse.csv diff --git a/templates/quotes/Mao Zedong/On the Correct Handling of Contradictions.csv b/quotes/Mao Zedong/On the Correct Handling of Contradictions.csv similarity index 100% rename from templates/quotes/Mao Zedong/On the Correct Handling of Contradictions.csv rename to quotes/Mao Zedong/On the Correct Handling of Contradictions.csv diff --git a/templates/quotes/Mao Zedong/Others.csv b/quotes/Mao Zedong/Others.csv similarity index 100% rename from templates/quotes/Mao Zedong/Others.csv rename to quotes/Mao Zedong/Others.csv diff --git a/templates/quotes/Mao Zedong/The Role of the Chinese Communist Party in the National War.csv b/quotes/Mao Zedong/The Role of the Chinese Communist Party in the National War.csv similarity index 100% rename from templates/quotes/Mao Zedong/The Role of the Chinese Communist Party in the National War.csv rename to quotes/Mao Zedong/The Role of the Chinese Communist Party in the National War.csv diff --git a/templates/quotes/Other Authors.csv b/quotes/Other Authors.csv similarity index 100% rename from templates/quotes/Other Authors.csv rename to quotes/Other Authors.csv diff --git a/templates/quotes/Rosa Luxemburg.csv b/quotes/Rosa Luxemburg.csv similarity index 100% rename from templates/quotes/Rosa Luxemburg.csv rename to quotes/Rosa Luxemburg.csv diff --git a/templates/quotes/Vladimir Lenin/Left-Wing Communism: An Infantile Disorder.csv b/quotes/Vladimir Lenin/Left-Wing Communism: An Infantile Disorder.csv similarity index 100% rename from templates/quotes/Vladimir Lenin/Left-Wing Communism: An Infantile Disorder.csv rename to quotes/Vladimir Lenin/Left-Wing Communism: An Infantile Disorder.csv diff --git a/templates/quotes/Vladimir Lenin/Others.csv b/quotes/Vladimir Lenin/Others.csv similarity index 100% rename from templates/quotes/Vladimir Lenin/Others.csv rename to quotes/Vladimir Lenin/Others.csv diff --git a/templates/quotes/Vladimir Lenin/State and Revolution.csv b/quotes/Vladimir Lenin/State and Revolution.csv similarity index 100% rename from templates/quotes/Vladimir Lenin/State and Revolution.csv rename to quotes/Vladimir Lenin/State and Revolution.csv diff --git a/templates/quotes/Vladimir Lenin/What Is To Be Done.csv b/quotes/Vladimir Lenin/What Is To Be Done.csv similarity index 100% rename from templates/quotes/Vladimir Lenin/What Is To Be Done.csv rename to quotes/Vladimir Lenin/What Is To Be Done.csv diff --git a/templates/Dockerfile b/src/Dockerfile similarity index 100% rename from templates/Dockerfile rename to src/Dockerfile diff --git a/templates/main.py b/src/main.py similarity index 100% rename from templates/main.py rename to src/main.py diff --git a/templates/requirements.txt b/src/requirements.txt similarity index 100% rename from templates/requirements.txt rename to src/requirements.txt