diff --git a/ansible/inventories/group_vars/all/vault.yaml b/ansible/inventories/group_vars/all/vault.yaml index ae4f465..c8b521d 100644 --- a/ansible/inventories/group_vars/all/vault.yaml +++ b/ansible/inventories/group_vars/all/vault.yaml @@ -1,12 +1,14 @@ $ANSIBLE_VAULT;1.1;AES256 -34353564303462326566326536303539333538303138356630316163613538383033353166396231 -3830643839333330373965323333656666333833653266650a656261663234363434336430343663 -38616130346632303664393162326463663866333765623739393961663135616432333862623539 -3039333232653938350a383565313339316339646634643532306135383365326230363063636533 -65393862643563616162663533303633343732656465666133353862396464373265343137376438 -36363034333565626261376665643033616366643431343432653261646132323463633838626439 -39386266346664346135333966613862636336343837383163336366623763313737306537353233 -35323566653939643831663234323637373631316436653165653332613030346331353365303834 -34656535633063626233373432653830306364323035626135623231363739383235343734656463 -64333134626333323032313431613235306538383735323364326235306564356138343061353935 -396263386437613738643465313161323337 +31646131636537653763323564346131333639656663326334316561633266333335623331383034 +3163376161306433323865646334373931393638363663360a666562373631373365623932613031 +37343563333730303535393636373533643734656462313631626130326134363031353263356133 +3266333534323539650a613262613434636162633536353963366161623438663437636138393036 +35666136623034333265313664663266353666396334663135333234313835663735306631363137 +61633638313530373562633135333939333863303339343532656236353431343237303663373430 +37623339643232666335343437393966303231386235626439306438313439363939663564333539 +38346665356638373265346633303031356333303862626139346432633237663330333930646630 +34663236326462386634326435373134666663613633323932383338616662333438623565366536 +63633439616137383438636637623135623339303736353364313462303062383331373164353632 +31653337653938306164653235656662343266316238326230393733303031366532643166646263 +33653934396131626330656432643164616136323831353835656538363131313934346234336561 +3363 diff --git a/ansible/inventories/group_vars/automotive/automotive.yaml b/ansible/inventories/group_vars/automotive/automotive.yaml index 6f41e65..502f30a 100644 --- a/ansible/inventories/group_vars/automotive/automotive.yaml +++ b/ansible/inventories/group_vars/automotive/automotive.yaml @@ -1,11 +1,21 @@ --- -web_projects_dir: /var/www/demosifisite -wordpress_site_name: demosifisite -wordpress_domain_name: beta.demosifisite.isti.cnr.it +docker_network_name: wp_net + +mysql_docker_tag: 9.7.0 +docker_mysql_hostname: web_db + +db_name: automotive_test_db +db_user: automotive_test_db_u +db_password: "{{ automotive_mysql_user_password }}" +db_root_password: "{{ automotive_mysql_root_password }}" + + +nginx_docker_tag: 1.31.1 +nginx_server_name: automotive.sse.cloud.isti.cnr.it +ssl: false + +wordpress_docker_tag: 7.0.0-php8.2-apache + +docker_base_volume_path: /usr/data/wp +docker_wordpress_hostname: automotive_test -wordpress_database_server: localhost -wordpress_database_port: 3306 -wordpress_database_name: wp_demosifisite -wordpress_database_username: demosifisite -wordpress_database_password: "{{ automotive_demosifisite_mysql_password }}" -wordpress_version: 6.4 \ No newline at end of file diff --git a/ansible/playbooks/requirements.yml b/ansible/playbooks/requirements.yml deleted file mode 100644 index ac6911c..0000000 --- a/ansible/playbooks/requirements.yml +++ /dev/null @@ -1,24 +0,0 @@ -# requirements.yml ---- -roles: - # - name: bodsch.dns.bind - # version: - - # - name: nginx - # src: git@github.com:myorg/ansible-role-nginx.git - # scm: git - # version: v2.0.0 - -collections: - - name: bodsch.dns - source: https://github.com/bodsch/ansible-collection-dns.git - type: git - version: 1.4.1 - - # - name: community.postgresql - # version: "3.2.0" - # - name: ansible.posix - # version: "1.5.4" - # - name: myorg.infrastructure - # source: https://hub.internal.com/api/galaxy/ - # version: "1.0.0" diff --git a/ansible/playbooks/templates/nginx.j2 b/ansible/playbooks/templates/nginx.j2 index 38fa67f..a5d6645 100644 --- a/ansible/playbooks/templates/nginx.j2 +++ b/ansible/playbooks/templates/nginx.j2 @@ -3,22 +3,9 @@ server { listen [::]:80; server_name {{ nginx_server_name }}; - location / { - return 301 https://$host$request_uri; - } -} - -server { - listen 443 ssl; - server_name {{ nginx_server_name }}; - root /var/www/html; index index.php; - ssl_certificate /etc/nginx/ssl/fullchain.pem; - ssl_certificate_key /etc/nginx/ssl/privatekey.pem; - ssl_trusted_certificate /etc/nginx/ssl/intermediatecertificate.pem; - location / { proxy_pass http://{{ docker_wordpress_hostname }}:80; proxy_set_header Host $host; @@ -26,4 +13,4 @@ server { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; } -} \ No newline at end of file +} \ No newline at end of file diff --git a/ansible/playbooks/wordpress.yaml b/ansible/playbooks/wordpress.yaml index 22bcfd1..8024f6b 100644 --- a/ansible/playbooks/wordpress.yaml +++ b/ansible/playbooks/wordpress.yaml @@ -1,13 +1,13 @@ --- - name: Install and configure Wordpress - hosts: all - collections: - - iamgini.wordpress - + hosts: web become : True + collections: + - chrissayon.wordpress_docker roles: - - ufw_install - - nginx_install - - wordpress_install - + - geerlingguy.docker + - chrissayon.wordpress_docker.network + - chrissayon.wordpress_docker.mysql + - chrissayon.wordpress_docker.wordpress + - chrissayon.wordpress_docker.nginx diff --git a/ansible/requirements.yml b/ansible/requirements.yml index 0e4f684..c939441 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -9,6 +9,11 @@ roles: # scm: git # version: v2.0.0 + # Required by wordpress_docker + - name: geerlingguy.docker + + + collections: - name: bodsch.dns source: https://github.com/bodsch/ansible-collection-dns.git @@ -18,8 +23,12 @@ collections: - name: dsglaser.cis_security version: 1.5.4 - - name: iamgini.wordpress - version: 1.0.0 + - name: chrissayon.wordpress_docker + version: 1.0.2 + +# dockerless wordpress +# - name: iamgini.wordpress +# version: 1.0.0 # - name: community.postgresql # version: "3.2.0"