From df913b2622d12f7cc1415ae58703d6ab1414b32d Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 28 Feb 2019 08:22:38 +0100 Subject: [PATCH 01/12] Fix missing quotes in ENV variables --- roles/docker/tasks/services/codimd.yml | 4 ++-- roles/docker/tasks/services/fider.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/docker/tasks/services/codimd.yml b/roles/docker/tasks/services/codimd.yml index 94c8082d..d58a0b96 100644 --- a/roles/docker/tasks/services/codimd.yml +++ b/roles/docker/tasks/services/codimd.yml @@ -43,9 +43,9 @@ env: CMD_DB_URL: "postgres://codimd:{{ postgres_passwords.codimd }}@codimd_db:5432/codimd" - CMD_ALLOW_EMAIL_REGISTER: False + CMD_ALLOW_EMAIL_REGISTER: "False" CMD_IMAGE_UPLOAD_TYPE: "filesystem" - CMD_EMAIL: False + CMD_EMAIL: "False" CMD_LDAP_URL: "ldap://openldap" CMD_LDAP_BINDDN: "cn=admin,dc=data,dc=coop" CMD_LDAP_BINDCREDENTIALS: "{{ ldap_admin_password }}" diff --git a/roles/docker/tasks/services/fider.yml b/roles/docker/tasks/services/fider.yml index ab6e7978..eb1dba59 100644 --- a/roles/docker/tasks/services/fider.yml +++ b/roles/docker/tasks/services/fider.yml @@ -32,8 +32,8 @@ - name: external_services - name: postfix env: - GO_ENV: production - DATABASE_URL: postgres://fider:{{ postgres_passwords.fider }}@fider_db:5432/fider?sslmode=disable + GO_ENV: "production" + DATABASE_URL: "postgres://fider:{{ postgres_passwords.fider }}@fider_db:5432/fider?sslmode=disable" JWT_SECRET: "{{ fider_jwt_secret }}" EMAIL_NOREPLY: noreply@{{ fider.domain }} From 53046bb85fd99a5bd23663f9945a2fb0c796a0aa Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 28 Feb 2019 08:28:54 +0100 Subject: [PATCH 02/12] Add apparmor package --- roles/ubuntu_base/tasks/base.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/ubuntu_base/tasks/base.yml b/roles/ubuntu_base/tasks/base.yml index 002a6f00..9d789a86 100644 --- a/roles/ubuntu_base/tasks/base.yml +++ b/roles/ubuntu_base/tasks/base.yml @@ -6,3 +6,4 @@ packages: - aptitude - python3-pip + - apparmor \ No newline at end of file From eb36b822b3b5750e87a01e48c84219fee7f14b8f Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 28 Feb 2019 08:31:28 +0100 Subject: [PATCH 03/12] Add netdata as docker container --- playbook.yml | 1 + roles/docker/defaults/main.yml | 6 +++++- roles/docker/tasks/services/netdata.yml | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 roles/docker/tasks/services/netdata.yml diff --git a/playbook.yml b/playbook.yml index 903a0bb9..5f7e3f2d 100644 --- a/playbook.yml +++ b/playbook.yml @@ -19,6 +19,7 @@ - matrix_riot - privatebin - codimd + - netdata smtp_host: postfix smtp_port: 587 diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index b07c4715..745c6524 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -31,4 +31,8 @@ privatebin: codimd: domain: "pad.{{ base_domain }}" - volume_folder: "{{ volume_root_folder }}/codimd" \ No newline at end of file + volume_folder: "{{ volume_root_folder }}/codimd" + +netdata: + domain: "netdata.{{ base_domain }}" + \ No newline at end of file diff --git a/roles/docker/tasks/services/netdata.yml b/roles/docker/tasks/services/netdata.yml new file mode 100644 index 00000000..75ab51d3 --- /dev/null +++ b/roles/docker/tasks/services/netdata.yml @@ -0,0 +1,24 @@ +--- + +- name: setup netdata docker container for system monitoring + docker_container: + name: netdata + image: netdata/netdata + hostname: "{{ netdata.domain }}" + capabilities: + - SYS_PTRACE + security_opts: + - apparmor:unconfined + volumes: + - /proc:/host/proc:ro + - /sys:/host/sys:ro + - /var/run/docker.sock:/var/run/docker.sock:ro + networks: + - name: external_services + env: + VIRTUAL_HOST : "{{ netdata.domain }}" + LETSENCRYPT_HOST: "{{ netdata.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + PGID: "999" + + From 92baab22a9d668dc818706028e9c205d21bce666 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Thu, 28 Feb 2019 20:51:30 +0100 Subject: [PATCH 04/12] Rename of server in netdata --- roles/docker/tasks/services/netdata.yml | 2 +- roles/ubuntu_base/tasks/base.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/docker/tasks/services/netdata.yml b/roles/docker/tasks/services/netdata.yml index 75ab51d3..ba08afbc 100644 --- a/roles/docker/tasks/services/netdata.yml +++ b/roles/docker/tasks/services/netdata.yml @@ -4,7 +4,7 @@ docker_container: name: netdata image: netdata/netdata - hostname: "{{ netdata.domain }}" + hostname: "hevonen.servers.{{ base_domain }}" capabilities: - SYS_PTRACE security_opts: diff --git a/roles/ubuntu_base/tasks/base.yml b/roles/ubuntu_base/tasks/base.yml index 9d789a86..8851eb50 100644 --- a/roles/ubuntu_base/tasks/base.yml +++ b/roles/ubuntu_base/tasks/base.yml @@ -6,4 +6,5 @@ packages: - aptitude - python3-pip - - apparmor \ No newline at end of file + - apparmor + \ No newline at end of file From 3b596c57014a3d6e5c13c1b2b82ee6da5144ccbc Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 2 Mar 2019 18:29:15 +0100 Subject: [PATCH 05/12] Add docker registry container --- playbook.yml | 1 + roles/docker/defaults/main.yml | 4 ++++ .../files/configs/docker_registry/nginx.conf | 1 + .../docker/tasks/services/docker_registry.yml | 24 +++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 roles/docker/files/configs/docker_registry/nginx.conf create mode 100644 roles/docker/tasks/services/docker_registry.yml diff --git a/playbook.yml b/playbook.yml index 5f7e3f2d..a24d7171 100644 --- a/playbook.yml +++ b/playbook.yml @@ -20,6 +20,7 @@ - privatebin - codimd - netdata + - docker_registry smtp_host: postfix smtp_port: 587 diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 745c6524..e3b245c0 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -35,4 +35,8 @@ codimd: netdata: domain: "netdata.{{ base_domain }}" + +docker_registry: + domain: "docker.{{ base_domain }}" + volume_folder: "{{ volume_root_folder }}/docker-registry" \ No newline at end of file diff --git a/roles/docker/files/configs/docker_registry/nginx.conf b/roles/docker/files/configs/docker_registry/nginx.conf new file mode 100644 index 00000000..c636de7d --- /dev/null +++ b/roles/docker/files/configs/docker_registry/nginx.conf @@ -0,0 +1 @@ +client_max_body_size 10G; diff --git a/roles/docker/tasks/services/docker_registry.yml b/roles/docker/tasks/services/docker_registry.yml new file mode 100644 index 00000000..cd4d5596 --- /dev/null +++ b/roles/docker/tasks/services/docker_registry.yml @@ -0,0 +1,24 @@ +--- +- name: copy docker registry nginx configuration + copy: + src: "files/configs/docker_registry/nginx.conf" + dest: "/docker-volumes/nginx/vhost/{{ docker_registry.domain }}" + mode: "0644" + +- name: docker registry container + docker_container: + name: registry + image: registry:2 + restart_policy: always + volumes: + - "{{ docker_registry.volume_folder }}/registry:/var/lib/registry" + - "{{ docker_registry.volume_folder }}/auth:/auth" + networks: + - name: external_services + env: + VIRTUAL_HOST: "{{ docker_registry.domain }}" + LETSENCRYPT_HOST: "{{ docker_registry.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + REGISTRY_AUTH: "htpasswd" + REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd" + REGISTRY_AUTH_HTPASSWD_REALM: "data.coop docker registry" From 1400b1893086ba919424715e929e0e9f6a610b54 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 2 Mar 2019 19:15:37 +0100 Subject: [PATCH 06/12] Set up authentication for local registry + log in --- group_vars/all/secrets.yml | 92 ++++++++++--------- .../docker/tasks/services/docker_registry.yml | 11 +++ 2 files changed, 58 insertions(+), 45 deletions(-) diff --git a/group_vars/all/secrets.yml b/group_vars/all/secrets.yml index a2385c5f..cd4f3601 100644 --- a/group_vars/all/secrets.yml +++ b/group_vars/all/secrets.yml @@ -1,46 +1,48 @@ $ANSIBLE_VAULT;1.1;AES256 -30643964633738353062356235363564666438643964363861626362376232393632633865643432 -6334636639326630316531636138633165306461643336630a623832356137663233333030333031 -33383865313439623337333662653563303065303233373261303635373838353039303231386337 -3339336362393237640a336166343730656337616135663530623764633631393635343233313163 -31633335356633343666396363323064376561643938373065656230396331316163316237353032 -32303962366338646239363336316639646534323561653132616632613737643063643264633033 -61386134366165303736373736393532343236656230353533383035623330336464326536383739 -34616633633539316364363832346665623330333765363363323032303065396566333936366532 -35363966303066373632323330343738656139323961613431393031366162653761613231666236 -39616361636365653330623562613331363239356461316332653838623866663264376262386461 -39383332393665336365303566646234643437386233323163626539303937356230616430616137 -36643435396536363261623764663038626131333364386433666466356265643662653964666564 -39303864636664623839656130663739346131306634306638333361643061303730346262366361 -34643330303137373065373863386233386632636238376538303631393233333334303532393037 -34613034336633383866353063333563663035323435343866313335373061623732643236306534 -61343431646232396362633733643362366262326334313737336164323166363333643235383432 -32633530333031363634396336366165383064306161316233396435303461653736653235626632 -32313661643537376566396561346366366332303034613135666231323935386639623439353034 -36373934386464326631666663653165396561623034643736656239356639313564613363393962 -37376462623663623433653737646538666330373264633663353831363936356331336362333562 -62326235373331376238316165336166336464306636386536636236353534663935623561336130 -34633437306539626635356133383032623839343238313736313462323637363630626664626639 -63346531333764366266386564656532633035366661626266313861666263643038333762313762 -36303036666236636661316530313865373239643964323831346535303338326334356665326538 -32326530653364393864653636313734336533323063316363326134393737663765323138613539 -63396631626435616239306634373965666461666366393033363936303331613131613934393636 -61616138376665646137663938306637623461306230633431613036656462623131333331393032 -61333933386166356536346133396535383064626161343832633034386365626137373566353065 -39383037373239396163383330386363366434386537636430653865616561323833373239623863 -30633034353466626265623065326333376336386361653064303535363736653338333632343662 -33663332636263393963633562373763653132646361383263316262663663343262643131383337 -32666362313536313765663139356266643861396136353831383561653435353237663633613365 -64636136663632613337666639363861663731306330653433326264646237653235633332393863 -62316536303836353931643338626561656633383561373738623163383262323266643461313236 -64363531643433346635343132353037653234636437326461303465623532376532616430306639 -32636639636365313162663437363235636132663630396338616134316230336464666233643334 -65626333626538633039626666666663333866303936363365663437396663643032633065363239 -66376235373363393439323866616438343365366366633630623139663534646636633833393533 -36373961633162323236616630656165636666303135623331356335383331353532666665366531 -36626435303535653439613564353436343931666533353430336130363038336531373530303036 -34356130633666623733663937343463613861313533623338316538313930663738323032386266 -65306262373932396264366634646639396632363561663164666539643132303066346432323234 -66623166306565353937323265363265666663633234323137303934343937626165616131396362 -39336438323233643830663366636537396538623635666137306230316434383264383534383033 -31393839323336356465363563326539366364343962626666303963646261353965 +31656564336138316264646534646130306533646131333630343536313761336639333131356563 +3331343230386365333931653362386231316165336336610a323931626563393363633963663762 +32346663396433303136383730303735383139376161656431643163666161616535303932623435 +3634636461343063620a373864353635353265336331613664323435323035646637303333623134 +33353765653836363834626136306166656535313432616135623936333837343363363332363432 +37353462383865363335376637353131393330363138623034623132333436623166313437656631 +64393164383063666130376238386334646365366332373765343635343837616532393862626635 +64393432323363333335623834313432366261663039386430313065653566633063663036646237 +30613936366435323465653165383334303061386337363638386236636535663838363765366564 +35326364663131653837363930613734353634636235663762316166383130633131643461363864 +61343165343762616165356139363234373236323239363439643062663730346636333165383466 +64356534663137393831333763663466306234663262303366316666316536336132333562333361 +39343534653064356536373363646536303038303535363665663334343230376138343830376166 +36336634643361653963373035333138613963643066383232353064333334326331313633616337 +65396130303939646633613066616466653633646366313265333330623538386363623466396438 +62336161346361363664633932646566613936663635373965653265303539316566386431636162 +37323763623834323837643731346439363538363261663830646439313937356339366139666136 +38373164383238316565366335316262643536303165323237376235383862343164373966373061 +38656264386562326261396262666332333961303730363832333233663939396665646633343230 +63363661343964373438383461333663663765616562643332343334343761623938643832326334 +39313239306133646165623564303739383764326136663932373530663433336630663137386536 +30646637306432643037313265356134353031333961613966636333333034316330316163346539 +36333530643364656238633862333664346334616631313633376464393034396563363662323865 +33656338333337623831333862656635636337633564643633343433316565623762353132633662 +34326138313364323834376130626332346566353238353331623238363364393566336162393861 +32646136646132303439303563386430623334373936326463313134303332663437386663303439 +32386562623662643462336334373832633765646631343434376331323062303738376135396330 +65646332613733333363653962323231626162376432653361636234366630343361316564316464 +63396433613231323932636365386532363465303730633634313135383661643537333861663034 +36326332653536623365353232313361656262633436363935336432386362353266356461663138 +66663333626466393066363331633238393230623233363665316634623137393563303264373634 +33663737363332643032653735326132393965376261346131653732623132376465633333623530 +32306437633162316264336466353234316131393831356461633362393839653864363236643232 +30386632356334613863626131623665353766363231373432383465666434343465666362333939 +36363231633030663336363930356262303830343939323665336562646561646439326532313265 +39343661643531663433633265633235353034633834623238646636313161396131343832333866 +32313237333134616235616561396366663732663465643234363364306637356235633535326436 +66623364613935643232666138363137383432616132623361363431313263386631656636393536 +34633439386666616363663036306132346137363665336439636539666163333939636630623332 +64313038653432303263376135316438623631663932666665623162313063323131643962663831 +61316435623837666431306439313831663361393538376363383938363738323935663432363561 +37393438653633396435653138363663653565623535393339356331326533316335646564323339 +30656363323263663262356364623736633930643063303733383862333231623534333266323337 +36373632323765326133656137363834343331626430356431313064333464323136626164653063 +36623436646562643364356537666437646431363865326464623838353961643865366537643432 +33306332616538396363613232373333353362373133666335636532313964343662343637393532 +373638303365356638363735393837393762 diff --git a/roles/docker/tasks/services/docker_registry.yml b/roles/docker/tasks/services/docker_registry.yml index cd4d5596..ea8b6061 100644 --- a/roles/docker/tasks/services/docker_registry.yml +++ b/roles/docker/tasks/services/docker_registry.yml @@ -22,3 +22,14 @@ REGISTRY_AUTH: "htpasswd" REGISTRY_AUTH_HTPASSWD_PATH: "/auth/htpasswd" REGISTRY_AUTH_HTPASSWD_REALM: "data.coop docker registry" + +- name: generate htpasswd file + shell: "docker exec -it registry htpasswd -Bbn docker {{ docker_password }} > {{ docker_registry.volume_folder }}/auth/htpasswd" + args: + creates: "{{ docker_registry.volume_folder }}/auth/htpasswd" + +- name: log in to local registry + docker_login: + registry: "{{ docker_registry.domain }}" + username: "docker" + password: "{{ docker_password }}" From e118b3087395793a19fe71455cd3b4a7f02ea4c2 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 2 Mar 2019 19:24:42 +0100 Subject: [PATCH 07/12] Deploy https://data.coop as a container --- playbook.yml | 3 ++- roles/docker/defaults/main.yml | 6 +++++- roles/docker/tasks/services/website.yml | 12 ++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 roles/docker/tasks/services/website.yml diff --git a/playbook.yml b/playbook.yml index a24d7171..ea2c2780 100644 --- a/playbook.yml +++ b/playbook.yml @@ -21,6 +21,7 @@ - codimd - netdata - docker_registry + - website smtp_host: postfix smtp_port: 587 @@ -29,4 +30,4 @@ - import_role: name: ubuntu_base - import_role: - name: docker + name: docker \ No newline at end of file diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index e3b245c0..7ad3094c 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -39,4 +39,8 @@ netdata: docker_registry: domain: "docker.{{ base_domain }}" volume_folder: "{{ volume_root_folder }}/docker-registry" - \ No newline at end of file + username: "docker" + password: "{{ docker_password }}" + +website: + domain: "{{ base_domain }}" diff --git a/roles/docker/tasks/services/website.yml b/roles/docker/tasks/services/website.yml new file mode 100644 index 00000000..bb50a607 --- /dev/null +++ b/roles/docker/tasks/services/website.yml @@ -0,0 +1,12 @@ +--- + +- name: setup data.coop website docker container + docker_container: + name: website + image: docker.data.coop/data-coop-website + networks: + - name: external_services + env: + VIRTUAL_HOST : "{{ website.domain }}" + LETSENCRYPT_HOST: "{{ website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" From ea8804d31c420fa04f838a3bb5ca7c9a260bc375 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 2 Mar 2019 19:51:32 +0100 Subject: [PATCH 08/12] Add cryptohagen.dk website --- playbook.yml | 2 +- roles/docker/defaults/main.yml | 5 ++++- roles/docker/tasks/services/website.yml | 12 ------------ roles/docker/tasks/services/websites.yml | 23 +++++++++++++++++++++++ 4 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 roles/docker/tasks/services/website.yml create mode 100644 roles/docker/tasks/services/websites.yml diff --git a/playbook.yml b/playbook.yml index ea2c2780..7c82f5de 100644 --- a/playbook.yml +++ b/playbook.yml @@ -21,7 +21,7 @@ - codimd - netdata - docker_registry - - website + - websites smtp_host: postfix smtp_port: 587 diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 7ad3094c..4a496395 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -42,5 +42,8 @@ docker_registry: username: "docker" password: "{{ docker_password }}" -website: +data_coop_website: domain: "{{ base_domain }}" + +cryptohagen_website: + domain: "cryptohagen.dk" diff --git a/roles/docker/tasks/services/website.yml b/roles/docker/tasks/services/website.yml deleted file mode 100644 index bb50a607..00000000 --- a/roles/docker/tasks/services/website.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- - -- name: setup data.coop website docker container - docker_container: - name: website - image: docker.data.coop/data-coop-website - networks: - - name: external_services - env: - VIRTUAL_HOST : "{{ website.domain }}" - LETSENCRYPT_HOST: "{{ website.domain }}" - LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" diff --git a/roles/docker/tasks/services/websites.yml b/roles/docker/tasks/services/websites.yml new file mode 100644 index 00000000..2b956921 --- /dev/null +++ b/roles/docker/tasks/services/websites.yml @@ -0,0 +1,23 @@ +--- + +- name: setup data.coop website docker container + docker_container: + name: website + image: docker.data.coop/data-coop-website + networks: + - name: external_services + env: + VIRTUAL_HOST : "{{ data_coop_website.domain }}" + LETSENCRYPT_HOST: "{{ data_coop_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" + +- name: setup cryptohagen.dk website docker container + docker_container: + name: website + image: docker.data.coop/cryptohagen-website + networks: + - name: external_services + env: + VIRTUAL_HOST : "{{ cryptohagen_website.domain }}" + LETSENCRYPT_HOST: "{{ cryptohagen_website.domain }}" + LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" From e30f05d3e49bec7869972f6ca4ff299eced49a48 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Tue, 12 Feb 2019 18:34:59 +0100 Subject: [PATCH 09/12] Clean up gitea docker --- roles/docker/tasks/services/gitea.yml | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/roles/docker/tasks/services/gitea.yml b/roles/docker/tasks/services/gitea.yml index b92ac732..37732a04 100644 --- a/roles/docker/tasks/services/gitea.yml +++ b/roles/docker/tasks/services/gitea.yml @@ -8,42 +8,19 @@ docker_volume: name: gitea -- name: gitea database volume - docker_volume: - name: gitea_db - -- name: gitea database container - docker_container: - name: gitea_db - image: postgres:10 - state: started - restart_policy: always - networks: - - name: gitea - volumes: - - gitea_db:/var/lib/postgresql/data - env: - POSTGRES_DB: somethingelse - POSTGRES_USER: gitea - POSTGRES_PASSWORD: "{{ postgres_passwords.gitea }}" - - name: gitea container docker_container: name: gitea image: gitea/gitea:latest - restart_policy: always + restart_policy: unless-stopped networks: - name: gitea - name: external_services volumes: - gitea:/data published_ports: - - "222:22" + - "22:22" env: VIRTUAL_HOST: "{{ gitea.domain }}" LETSENCRYPT_HOST: "{{ gitea.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" - POSTGRES_HOST: gitea_db - POSTGRES_DB: gitea - POSTGRES_USER: gitea - POSTGRES_PASSWORD: "{{ postgres_passwords.gitea }}" From 454fc751d294a0d1bfc9cdb37da05fd7c784be4a Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 13 Feb 2019 08:41:41 +0100 Subject: [PATCH 10/12] Add VIRTUAL_PORT to gitea --- roles/docker/tasks/services/gitea.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/docker/tasks/services/gitea.yml b/roles/docker/tasks/services/gitea.yml index 37732a04..2db2a2fe 100644 --- a/roles/docker/tasks/services/gitea.yml +++ b/roles/docker/tasks/services/gitea.yml @@ -1,5 +1,5 @@ --- - +# old DNS: 138.68.71.153 - name: gitea network docker_network: name: gitea @@ -22,5 +22,6 @@ - "22:22" env: VIRTUAL_HOST: "{{ gitea.domain }}" + VIRTUAL_PORT: "3000" LETSENCRYPT_HOST: "{{ gitea.domain }}" LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}" From 24a3f4ab3d516964c86c48906996289b4b3964dc Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Wed, 13 Feb 2019 12:38:36 +0100 Subject: [PATCH 11/12] Add volume folder for gitea --- roles/docker/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 4a496395..74d66fa9 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -12,6 +12,7 @@ nextcloud: gitea: domain: "git.{{ base_domain }}" + volume_folder: "{{ volume_root_folder }}/gitea" passit: domain: "passit.{{ base_domain }}" From 1cd9b67b4ef09e4d26d45e4f9bf14319bfc9a2c8 Mon Sep 17 00:00:00 2001 From: Jesper Hess Nielsen Date: Sat, 2 Mar 2019 21:30:54 +0100 Subject: [PATCH 12/12] Configure gitea container as per old server --- roles/docker/tasks/services/gitea.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/roles/docker/tasks/services/gitea.yml b/roles/docker/tasks/services/gitea.yml index 2db2a2fe..1e382638 100644 --- a/roles/docker/tasks/services/gitea.yml +++ b/roles/docker/tasks/services/gitea.yml @@ -1,13 +1,5 @@ --- # old DNS: 138.68.71.153 -- name: gitea network - docker_network: - name: gitea - -- name: gitea app volume - docker_volume: - name: gitea - - name: gitea container docker_container: name: gitea @@ -17,7 +9,7 @@ - name: gitea - name: external_services volumes: - - gitea:/data + - "{{ gitea.volume_folder }}:/data" published_ports: - "22:22" env: