From 54ec8318f94abb09208a04e8caf7c1fa0b2357e0 Mon Sep 17 00:00:00 2001 From: Thomas Constans Date: Fri, 9 Jun 2023 09:55:08 +0200 Subject: [PATCH] mise au point instructions --- Readme.md | 11 +++++ apache.yml | 11 ----- myapache5/README.md | 40 ------------------ myapache5/defaults/main.yml | 2 - myapache5/files/index.html | 1 - myapache5/handlers/main.yml | 11 ----- myapache5/meta/main.yml | 57 ------------------------- myapache5/tasks/main.yml | 70 ------------------------------- myapache5/templates/vhost.conf.jj | 28 ------------- myapache5/tests/inventory | 2 - myapache5/tests/test.yml | 5 --- myapache5/vars/centos.yml | 1 - myapache5/vars/debian.yml | 7 ---- myapache5/vars/main.yml | 15 ------- myapache5/vars/redhat.yml | 7 ---- 15 files changed, 11 insertions(+), 257 deletions(-) create mode 100644 Readme.md delete mode 100644 apache.yml delete mode 100644 myapache5/README.md delete mode 100644 myapache5/defaults/main.yml delete mode 100644 myapache5/files/index.html delete mode 100644 myapache5/handlers/main.yml delete mode 100644 myapache5/meta/main.yml delete mode 100644 myapache5/tasks/main.yml delete mode 100644 myapache5/templates/vhost.conf.jj delete mode 100644 myapache5/tests/inventory delete mode 100644 myapache5/tests/test.yml delete mode 120000 myapache5/vars/centos.yml delete mode 100644 myapache5/vars/debian.yml delete mode 100644 myapache5/vars/main.yml delete mode 100644 myapache5/vars/redhat.yml diff --git a/Readme.md b/Readme.md new file mode 100644 index 0000000..c69326f --- /dev/null +++ b/Readme.md @@ -0,0 +1,11 @@ +# Prompts + +Récupérer la solution de l'atelier adhoc2playbook: + +```bash +cd +git clone -b solution https://infra.opendoor.fr/git/tom/sib_8_adhoc_to_playbook.git prompt +cd prompt +``` + +Adapter le playbook pour que le mot de passe de l'utilisateur *ansible* soit demandé lors de l'exécution du playbook diff --git a/apache.yml b/apache.yml deleted file mode 100644 index e7fbd62..0000000 --- a/apache.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: install apache via ansible playbook - hosts: test - user: ansible - become: true - vars_prompt: - - name: httpasswd - prompt: htpasswd protected area password - private: yes - roles: - - myapache5 diff --git a/myapache5/README.md b/myapache5/README.md deleted file mode 100644 index 34e1a69..0000000 --- a/myapache5/README.md +++ /dev/null @@ -1,40 +0,0 @@ -Role Name -========= - -Rôle de deploiement apache sur une centos ou Debian - -Répertoire privé protégé par mot de passe demandé à l'utilisateur - -Requirements ------------- - -None - -Role Variables --------------- - -Voir fichier vars/main.yml - -Dependencies ------------- - -None - -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: - - { myapache } - -License -------- - -BSD - -Author Information ------------------- - -Thomas Constans diff --git a/myapache5/defaults/main.yml b/myapache5/defaults/main.yml deleted file mode 100644 index 8c667e1..0000000 --- a/myapache5/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for myapache \ No newline at end of file diff --git a/myapache5/files/index.html b/myapache5/files/index.html deleted file mode 100644 index 416474e..0000000 --- a/myapache5/files/index.html +++ /dev/null @@ -1 +0,0 @@ -

hello World

\ No newline at end of file diff --git a/myapache5/handlers/main.yml b/myapache5/handlers/main.yml deleted file mode 100644 index 2a19def..0000000 --- a/myapache5/handlers/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# handlers file for myapache -- name: reload httpd - service: - name: "{{ service_name }}" - state: reloaded - -- name: reload firewalld - service: - name: firewalld - state: reloaded diff --git a/myapache5/meta/main.yml b/myapache5/meta/main.yml deleted file mode 100644 index 7223799..0000000 --- a/myapache5/meta/main.yml +++ /dev/null @@ -1,57 +0,0 @@ -galaxy_info: - author: your name - description: your description - company: your company (optional) - - # 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 - - # Some suggested licenses: - # - BSD (default) - # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY - license: license (GPLv2, CC-BY, etc) - - min_ansible_version: 1.2 - - # If this a Container Enabled role, provide the minimum Ansible Container version. - # min_ansible_container_version: - - # Optionally specify the branch Galaxy will use when accessing the GitHub - # repo for this role. During role install, if no tags are available, - # Galaxy will use this branch. During import Galaxy will access files on - # this branch. If Travis integration is configured, only notifications for this - # branch will be accepted. Otherwise, in all cases, the repo's default branch - # (usually master) will be used. - #github_branch: - - # - # platforms is a list of platforms, and each platform has a name and a list of versions. - # - # 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. \ No newline at end of file diff --git a/myapache5/tasks/main.yml b/myapache5/tasks/main.yml deleted file mode 100644 index de72a52..0000000 --- a/myapache5/tasks/main.yml +++ /dev/null @@ -1,70 +0,0 @@ ---- -# tasks file for myapache -- name: import distribution specific variables - tags: http - include_vars: "{{ ansible_distribution|lower }}.yml" - -- name: install apache - tags: httpd - package: - name: "{{ package_name }}" - state: latest - -- name: conf httpd - tags: httpd - notify: reload httpd - template: - src: vhost.conf.jj - dest: "{{ apache_conf_dir }}/vhost.conf" - mode: 0640 - owner: root - group: "{{ apache_group }}" - -- name: activate apache - tags: httpd - service: - name: "{{ service_name }}" - enabled: yes - -- name: open firewall port - tags: httpd - firewalld: - service: http - permanent: yes - immediate: yes - state: enabled - ignore_errors: yes - notify: reload firewalld - when: ansible_distribution|lower != "debian" - -- name: create documentroot - tags: httpd - file: - name: "{{ item.documentroot }}" - state: directory - with_items: - - "{{ apache_vhosts }}" - -- name: install python passlib package - tags: req,httpd - package: - name: python-passlib - state: latest - -- name: create index file - tags: httpd - copy: - src: index.html - dest: "{{ item.documentroot }}/index.html" - mode: 0644 - with_items: - - "{{ apache_vhosts }}" - -- name: passwd file - htpasswd: - path: "{{ apache_conf_dir }}/passwd" - name: tom - password: "{{ httpasswd }}" - mode: 0640 - owner: root - group: "{{ apache_group }}" \ No newline at end of file diff --git a/myapache5/templates/vhost.conf.jj b/myapache5/templates/vhost.conf.jj deleted file mode 100644 index be39939..0000000 --- a/myapache5/templates/vhost.conf.jj +++ /dev/null @@ -1,28 +0,0 @@ -{% for vhost in apache_vhosts %} - - ServerName {{ vhost.servername|lower }} - ServerAlias {{ vhost.serveralias }} - DocumentRoot {{ vhost.documentroot }} - CustomLog {{ vhost.accesslog }} combined - ErrorLog {{ vhost.errorlog }} - - Options none - Allowoverride none - Require all denied - - - - Options {{ vhost.documentrootoptions|default( "none" ) }} - Require all granted - - - Alias /private /usr/share/doc - - Options indexes - AuthName "stop" - AuthType Basic - AuthUserFile {{ apache_conf_dir }}/passwd - require valid-user - - -{% endfor %} \ No newline at end of file diff --git a/myapache5/tests/inventory b/myapache5/tests/inventory deleted file mode 100644 index 878877b..0000000 --- a/myapache5/tests/inventory +++ /dev/null @@ -1,2 +0,0 @@ -localhost - diff --git a/myapache5/tests/test.yml b/myapache5/tests/test.yml deleted file mode 100644 index 797e379..0000000 --- a/myapache5/tests/test.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- hosts: localhost - remote_user: root - roles: - - myapache \ No newline at end of file diff --git a/myapache5/vars/centos.yml b/myapache5/vars/centos.yml deleted file mode 120000 index ba2f905..0000000 --- a/myapache5/vars/centos.yml +++ /dev/null @@ -1 +0,0 @@ -redhat.yml \ No newline at end of file diff --git a/myapache5/vars/debian.yml b/myapache5/vars/debian.yml deleted file mode 100644 index 03ceb9d..0000000 --- a/myapache5/vars/debian.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apache_conf_dir: /etc/apache2/sites-enabled -apache_log_dir: /var/log/apache2 -package_name: apache2 -service_name: apache2 -apache_user: www-data -apache_group: www-data diff --git a/myapache5/vars/main.yml b/myapache5/vars/main.yml deleted file mode 100644 index 1fb822e..0000000 --- a/myapache5/vars/main.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# vars file for myapache -http_port: 80 -apache_vhosts: -- servername: ORSYS.Fr - serveralias: www.orsys.fr - documentroot: /var/www/html/orsys.fr - accesslog: "{{ apache_log_dir }}/access_orsys.fr_log" - errorlog: "{{ apache_log_dir }}/error_orsys.fr_log" -- servername: thomas.fr - serveralias: www.thomas.fr - documentroot: /var/www/html/thomas.fr - accesslog: "{{ apache_log_dir }}/access_thomas.fr_log" - errorlog: "{{ apache_log_dir }}/error_thomas.fr_log" - documentrootoptions: indexes \ No newline at end of file diff --git a/myapache5/vars/redhat.yml b/myapache5/vars/redhat.yml deleted file mode 100644 index c77ed08..0000000 --- a/myapache5/vars/redhat.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -apache_conf_dir: /etc/httpd/conf.d/ -apache_log_dir: /var/log/httpd -package_name: httpd -service_name: httpd -apache_user: apache -apache_group: apache