diff --git a/.gitignore b/.gitignore index 09ea058..c936e3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.ansible /.idea /.vagrant /.vscode diff --git a/files/apps/music/docker-compose.yml b/files/apps/music/docker-compose.yml deleted file mode 100644 index 59f2c59..0000000 --- a/files/apps/music/docker-compose.yml +++ /dev/null @@ -1,21 +0,0 @@ -services: - navidrome: - image: deluan/navidrome:0.55.2 - ports: - - "127.0.0.1:${WEB_SERVER_PORT}:4533" - restart: unless-stopped - environment: - ND_BASEURL: "https://music.vakhrushev.me" - ND_LOGLEVEL: "info" - ND_SCANSCHEDULE: "0 4 * * *" - ND_SESSIONTIMEOUT: "24h" - ND_AUTOIMPORTPLAYLISTS: "false" - volumes: - - "./data:/data" - - "yandex-storage:/music:ro" - -volumes: - yandex-storage: - driver: "rclone" - driver_opts: - remote: "yandex-s3-music-encrypted:" diff --git a/playbook-app-music.yml b/playbook-app-music.yml deleted file mode 100644 index 0ccb822..0000000 --- a/playbook-app-music.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- name: 'Configure music application' - hosts: all - - vars_files: - - vars/ports.yml - - vars/vars.yml - - vars: - base_dir: '/home/major/applications/music/' - - tasks: - - - name: 'Create application directories' - ansible.builtin.file: - path: '{{ item }}' - state: 'directory' - mode: '0755' - loop: - - '{{ base_dir }}' - - '{{ (base_dir, "data") | path_join }}' - - - name: 'Copy application files' - ansible.builtin.copy: - src: '{{ item }}' - dest: '{{ base_dir }}' - mode: '0644' - loop: - - './files/apps/music/docker-compose.yml' - - - name: 'Set up environment variables for application' - ansible.builtin.template: - src: 'env.j2' - dest: '{{ (base_dir, ".env") | path_join }}' - mode: '0644' - vars: - env_dict: - WEB_SERVER_PORT: '{{ navidrome_port }}' - - - name: 'Run application with docker compose' - community.docker.docker_compose_v2: - project_src: '{{ base_dir }}' - state: 'present' diff --git a/playbook-docker.yml b/playbook-docker.yml index be4f0b5..2c4589f 100644 --- a/playbook-docker.yml +++ b/playbook-docker.yml @@ -24,10 +24,6 @@ docker_users: - major - - name: 'Install rclone plugin' - ansible.builtin.import_role: - name: docker_rclone_plugin - - name: 'Login to yandex docker registry.' ansible.builtin.script: cmd: 'files/yandex-docker-registry-auth.sh' diff --git a/roles/docker_rclone_plugin/README.md b/roles/docker_rclone_plugin/README.md deleted file mode 100644 index 225dd44..0000000 --- a/roles/docker_rclone_plugin/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/docker_rclone_plugin/defaults/main.yml b/roles/docker_rclone_plugin/defaults/main.yml deleted file mode 100644 index e3280b1..0000000 --- a/roles/docker_rclone_plugin/defaults/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -docker_rclone_plugin_config: './files/rclone.conf' diff --git a/roles/docker_rclone_plugin/handlers/main.yml b/roles/docker_rclone_plugin/handlers/main.yml deleted file mode 100644 index 5f82ece..0000000 --- a/roles/docker_rclone_plugin/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# handlers file for docker_rclone_plugin diff --git a/roles/docker_rclone_plugin/meta/main.yml b/roles/docker_rclone_plugin/meta/main.yml deleted file mode 100644 index f8c95c8..0000000 --- a/roles/docker_rclone_plugin/meta/main.yml +++ /dev/null @@ -1,51 +0,0 @@ -galaxy_info: - author: 'Anton Vakhrushev' - description: 'Rclone docker plugin' - - # If the issue tracker for your role is not on github, uncomment the - # next line and provide a value - # issue_tracker_url: http://example.com/issue/tracker - - # Choose a valid license ID from https://spdx.org - some suggested licenses: - # - BSD-3-Clause (default) - # - MIT - # - GPL-2.0-or-later - # - GPL-3.0-only - # - Apache-2.0 - # - CC-BY-4.0 - license: 'MIT' - - min_ansible_version: '2.1' - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # - # Provide a list of supported platforms, and for each platform a list of versions. - # If you don't wish to enumerate all versions for a particular platform, use 'all'. - # To view available platforms and versions (or releases), visit: - # https://galaxy.ansible.com/api/v1/platforms/ - # - # platforms: - # - name: Fedora - # versions: - # - all - # - 25 - # - name: SomePlatform - # versions: - # - all - # - 1.0 - # - 7 - # - 99.99 - - galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - -dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/roles/docker_rclone_plugin/tasks/main.yml b/roles/docker_rclone_plugin/tasks/main.yml deleted file mode 100644 index 386d9ec..0000000 --- a/roles/docker_rclone_plugin/tasks/main.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: 'Create required plugin directories' - ansible.builtin.file: - path: '{{ item }}' - state: 'directory' - mode: '0755' - loop: - - '/var/lib/docker-plugins/rclone/config' - - '/var/lib/docker-plugins/rclone/cache' - -- name: 'Install docker plugin' - community.docker.docker_plugin: - plugin_name: 'rclone/docker-volume-rclone:amd64' - alias: 'rclone' - state: 'enable' - plugin_options: - args: '-v' - -- name: 'Copy rclone config' - ansible.builtin.copy: - src: '{{ docker_rclone_plugin_config }}' - dest: '/var/lib/docker-plugins/rclone/config/rclone.conf' - mode: '0644' diff --git a/templates/Caddyfile.j2 b/templates/Caddyfile.j2 index 1a3ab5f..af21c61 100644 --- a/templates/Caddyfile.j2 +++ b/templates/Caddyfile.j2 @@ -58,14 +58,6 @@ outline.vakhrushev.me { } } -music.vakhrushev.me { - tls anwinged@ya.ru - - reverse_proxy { - to 127.0.0.1:{{ navidrome_port }} - } -} - gramps.vakhrushev.me { tls anwinged@ya.ru