diff --git a/ansible/roles/pages/files/docker-compose.yml b/ansible/roles/pages/files/docker-compose.yml index aaa1161..16194ee 100644 --- a/ansible/roles/pages/files/docker-compose.yml +++ b/ansible/roles/pages/files/docker-compose.yml @@ -1,16 +1,14 @@ version: "2.3" services: - minio: - image: minio/minio:latest + webdav: + image: theorangeone/webdav:latest restart: unless-stopped - user: "{{ pages_user_id }}" volumes: - - ./sites:/data - command: server /data --quiet + - ./sites:/srv + - ./htpasswd.txt:/etc/nginx/.htpasswd:ro environment: - - MINIO_ACCESS_KEY={{ minio_access_key }} - - MINIO_SECRET_KEY={{ minio_secret_key }} + - PUID={{ docker_user.id }} labels: - traefik.enable=true - traefik.http.routers.pages.rule=Host(`pages.theorangeone.net`) @@ -21,7 +19,7 @@ services: volumes: - ./sites:/sites:ro restart: unless-stopped - user: "{{ pages_user_id }}" + user: "{{ docker_user.id }}" ports: - 127.0.0.1:5000:5000 environment: diff --git a/ansible/roles/pages/tasks/main.yml b/ansible/roles/pages/tasks/main.yml index c8986b1..61e4d12 100644 --- a/ansible/roles/pages/tasks/main.yml +++ b/ansible/roles/pages/tasks/main.yml @@ -10,7 +10,7 @@ file: path: /opt/pages/sites state: directory - owner: "{{ pages_user_id }}" + owner: "{{ docker_user.name }}" mode: "{{ docker_compose_directory_mask }}" become: true @@ -23,3 +23,20 @@ validate: docker-compose -f %s config notify: restart pages become: true + +- name: Create superuser + htpasswd: + path: /opt/pages/htpasswd.txt + name: jake + password: "{{ superuser_password }}" + mode: 0640 + owner: "{{ docker_user.name }}" + become: true + +- name: Create GitHub user + htpasswd: + path: /opt/pages/htpasswd.txt + name: github + password: "{{ github_user_password }}" + mode: 0640 + become: true diff --git a/ansible/roles/pages/vars/main.yml b/ansible/roles/pages/vars/main.yml index 28ac663..d7ef8ca 100644 --- a/ansible/roles/pages/vars/main.yml +++ b/ansible/roles/pages/vars/main.yml @@ -1,24 +1,22 @@ -minio_access_key: !vault | +superuser_password: !vault | $ANSIBLE_VAULT;1.1;AES256 - 36353266366231326332636363333537356564336266613763333934333062356134393561336166 - 3864643564356533383561326336656239366163363861340a393564386234373632356530636165 - 64326637643237633366333931653265663534363831383063376665376163653861303464613035 - 3436613338323537640a616266623930633862306638633166373634393739336635323031393361 - 37383136326330653239356431363935623530653531356135633463643638363036643634653336 - 31316266373539653063666438376364663734323837356330393436303836633239353037343738 - 31303933376162623838386233366363643532323366306161663838313530366535636532666530 - 65666633306534616165393930303738313737353635306635373430613261633265616536386336 - 31393238643230336130643938373432396238613931663939383464343533303865 -minio_secret_key: !vault | + 33323536323232653865636163386562663163653432613431336462656338336238366632636562 + 3234636362623836396632633063386165633933663733630a623930346562303165326566633263 + 65396433356339363430636536343538323966343731313735343738316566303662366264313639 + 6363313630333736640a376461643132343437623430373363303731376363643866386565623962 + 66313038346538613638306565366131613339346338613732633862376265353464383531323830 + 32626630356265396434303063383565306536613062373964303432363363373463353630353664 + 61313163396537653630346437346139613031343566636462653437646530643862633564636138 + 39323437303166633131646462336666376534383864623863626330346462363661336535323839 + 61336133633962303330383161383864373237633138353837613230306565323462 +github_user_password: !vault | $ANSIBLE_VAULT;1.1;AES256 - 34633434353863636337666139366530656164613565356465336538386162393539666638383831 - 3666623139366138393465646536396537323739383061390a373465626233396439336235323964 - 61326266666333393265636666326336343334646538306466643064366639353431393336616436 - 6438313535613638310a623466313233643066656163646334336536333136636136386561623536 - 31653262346331343737346337323738313138626236363962616661383634613435396334326633 - 34343464386239333938383365343431396236653865326536353238653431643539653731636130 - 32353265353237346565373333646161356664663862393364313463333533643331396535393937 - 61613737396262316165326633363833343133363838633836376631666432653237393739396131 - 36643531353739373063393230356137623833346439393035646463636336356334 - -pages_user_id: 33 + 37613664616532313936633565643530333933646661373538643131353832626537663839333962 + 6163376230356337666362663638336366353466333832350a376635653836373036353034633963 + 30373463636331623665363162306230303966656233396333323962303734643164646234643838 + 3836383834636261340a353761623461396264303939373339363434356461343037646630306566 + 35633261663639363862366533616236326463366131626337336135313036363236366332646361 + 36393863643039616439393862653261663134663138373164306263623666343036323033303262 + 38343763363363623334313735346230373135626337343437633833633230376466396663363233 + 32303562653733653334316439663230353031656132363661383166656639396235353838396535 + 31636364366363316339386131333530626462633765393033393666343763303366