diff --git a/playbooks/home_app.yml b/playbooks/home_app.yml index 0ac5e44..8ba3a1c 100755 --- a/playbooks/home_app.yml +++ b/playbooks/home_app.yml @@ -9,10 +9,6 @@ state: started restart_policy: unless-stopped pull: yes - pre_tasks: - - name: ensure docker network - docker_network: name=web - tags: [ docker ] tasks: - name: include tasks for applications include_tasks: tasks/{{ item }} @@ -25,19 +21,6 @@ backup_s3backup_list_extra: - /data tags: [ backup ] - - role: ingress - vars: - ingress_container_image: "nginx:latest" - ingress_container_ports: - - 80:80 - ingress_container_config_mount: /etc/nginx/conf.d - ingress_container_persist_dir: /data/nginx - ingress_listen_args: 80 - ingress_listen_tls: no - ingress_servers: - - name: octoprint.local.desu.ltd - proxy_pass: http://octoprint:80 - tags: [ ingress ] - hosts: vm-bot-1.home.mgmt.desu.ltd gather_facts: no module_defaults: diff --git a/playbooks/tasks/app/octoprint.yml b/playbooks/tasks/app/octoprint.yml index d3547dd..5d8b436 100644 --- a/playbooks/tasks/app/octoprint.yml +++ b/playbooks/tasks/app/octoprint.yml @@ -4,15 +4,14 @@ docker_container: name: octoprint image: octoprint/octoprint:latest + ports: + - 80:80 # Uncomment all this stuff when the camera shows up # env: # ENABLE_MJPG_STREAMER: true # devices: # - /dev/ttyACM0:/dev/ttyACM0 # - /dev/video0:/dev/video0 - networks: - - name: web - aliases: [ "octoprint" ] volumes: - /etc/localtime:/etc/localtime:ro - /data/octoprint:/octoprint