Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/book/v2/setup/setup-packages.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Update/Upgrade system packages:
sudo dnf upgrade -y
```

Now, install the latest version of **Ansible Core** and run **ansible-galaxy** in order to install collections:
Now, install the latest version of **Ansible Core** and run **ansible-galaxy** to install collections:

```shell
sudo dnf install ansible-core -y
Expand Down
2 changes: 1 addition & 1 deletion wsl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Update/Upgrade system packages:
sudo dnf upgrade -y
```

Now, install the latest version of **Ansible Core** and run **ansible-galaxy** in order to install collections:
Now, install the latest version of **Ansible Core** and run **ansible-galaxy** to install collections:

```shell
sudo dnf install ansible-core -y
Expand Down
3 changes: 2 additions & 1 deletion wsl/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,18 @@
vars_files:
- ./config.yml
- ./roles/apache/vars/main.yml
- ./roles/system/vars/main.yml
tasks:
- name: Install and configure packages
include_role:
name: "{{ role }}"
tasks_from: main
loop:
- system
- apache
- php
- mariadb
- phpmyadmin
- system
- composer
- nodejs
- git
Expand Down
2 changes: 2 additions & 0 deletions wsl/roles/git/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
value: "{{ item.value }}"
scope: global
with_dict: "{{ git_config }}"
become: false
- name: Apply global user configurations
git_config:
name: "{{ item.key }}"
value: "{{ item.value }}"
scope: global
with_dict: "{{ config.git.config }}"
become: false
21 changes: 21 additions & 0 deletions wsl/roles/system/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,24 @@
template:
src: bash_profile.j2
dest: "{{ bash_profile_dest }}"
- name: Add create runtime directories script
template:
src: runtime-directories.sh.j2
dest: "{{ runtime_directories_script_path }}"
mode: "0755"
- name: Add create runtime directories service
template:
src: runtime-directories.service.j2
dest: "{{ runtime_directories_service_path }}"
mode: "0755"
- name: Reload systemd
ansible.builtin.systemd:
daemon_reload: yes
- name: Enable runtime-directories.service
ansible.builtin.systemd:
name: runtime-directories.service
enabled: yes
- name: Start runtime-directories.service
ansible.builtin.systemd:
name: runtime-directories.service
state: started
13 changes: 13 additions & 0 deletions wsl/roles/system/templates/runtime-directories.service.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[Unit]
Description=Create runtime directories for Apache and MariaDB
DefaultDependencies=no
After=local-fs.target
Before=httpd.service mariadb.service

[Service]
Type=oneshot
ExecStart={{ runtime_directories_script_path }}
RemainAfterExit=true

[Install]
WantedBy=multi-user.target
8 changes: 8 additions & 0 deletions wsl/roles/system/templates/runtime-directories.sh.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -e

# Create /run/httpd with correct ownership and permissions
install -d -o apache -g apache -m 0755 /run/httpd

# Create /run/mariadb with correct ownership and permissions
install -d -o mysql -g mysql -m 0755 /run/mariadb
2 changes: 2 additions & 0 deletions wsl/roles/system/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
wsl_config_dest: /etc/wsl.conf
bash_profile_dest: "/home/{{ config.system.username }}/.bash_profile"
runtime_directories_script_path: "/usr/local/bin/runtime-directories.sh"
runtime_directories_service_path: "/etc/systemd/system/runtime-directories.service"