Skip to content

Commit d2483f3

Browse files
committed
error_pages: rename to error-pages to avoid bad hostname format
1 parent 86b1a73 commit d2483f3

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

roles/error_pages/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Basics
1212
################################
1313

14-
error_pages_name: error_pages
14+
error_pages_name: error-pages
1515

1616
################################
1717
# Config
@@ -53,7 +53,7 @@ error_pages_docker_commands: "{{ error_pages_docker_commands_default
5353

5454
# Volumes
5555
error_pages_docker_volumes_default:
56-
- "/opt/error_pages:/opt/html"
56+
- "/opt/error-pages:/opt/html"
5757
error_pages_docker_volumes_custom: []
5858
error_pages_docker_volumes: "{{ error_pages_docker_volumes_default
5959
+ error_pages_docker_volumes_custom }}"

roles/error_pages/tasks/main.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,23 @@
77
# GNU General Public License v3.0 #
88
##########################################################################
99
---
10-
- name: Check if folder already exists
10+
- name: Check if legacy folder exists
1111
ansible.builtin.stat:
1212
path: "/opt/error_pages"
13+
register: error_pages_legacy_folder
14+
15+
- name: Migrate legacy folder if it exists
16+
ansible.builtin.shell: "mv /opt/error_pages /opt/error-pages"
17+
when: error_pages_legacy_folder.stat.exists
18+
19+
- name: Check if folder already exists
20+
ansible.builtin.stat:
21+
path: "/opt/error-pages"
1322
register: error_pages_folder
1423

1524
- name: Create directory
1625
ansible.builtin.file:
17-
path: "/opt/error_pages"
26+
path: "/opt/error-pages"
1827
state: directory
1928
owner: "{{ user.name }}"
2029
group: "{{ user.name }}"
@@ -23,12 +32,12 @@
2332

2433
- name: Export error pages from container
2534
community.docker.docker_container:
26-
name: error_pages-build
35+
name: error-pages-build
2736
image: "tarampampam/error-pages"
2837
user: "{{ uid }}:{{ gid }}"
2938
command: "build --config-file ./error-pages.yml /out"
3039
volumes:
31-
- "/opt/error_pages:/out:rw"
40+
- "/opt/error-pages:/out:rw"
3241
networks:
3342
- name: saltbox
3443
container_default_behavior: compatibility

0 commit comments

Comments
 (0)