From 1d9de75b01d2de139730fb447952be758ae2738b Mon Sep 17 00:00:00 2001 From: ~ubergeek Date: Fri, 21 Dec 2018 07:59:42 -0700 Subject: [PATCH] finished re-aranging roles, for now --- hosts | 9 ++++- roles/common/tasks/packages.yml | 12 ------ roles/common/tasks/users.yml | 60 ------------------------------ roles/shell/files/resolv.conf | 2 + roles/shell/handlers/main.yml | 0 roles/shell/meta/main.yml | 0 roles/shell/tasks/main.yml | 5 +++ roles/shell/tasks/packages.yml | 16 ++++++++ roles/shell/tasks/users.yml | 56 ++++++++++++++++++++++++++++ roles/shell/vars/main.yml | 0 roles/webserver/tasks/main.yml | 3 +- roles/webserver/tasks/packages.yml | 5 +-- 12 files changed, 90 insertions(+), 78 deletions(-) create mode 100644 roles/shell/files/resolv.conf create mode 100644 roles/shell/handlers/main.yml create mode 100644 roles/shell/meta/main.yml create mode 100644 roles/shell/tasks/main.yml create mode 100644 roles/shell/tasks/packages.yml create mode 100644 roles/shell/tasks/users.yml create mode 100644 roles/shell/vars/main.yml diff --git a/hosts b/hosts index 5312389..5c253ab 100644 --- a/hosts +++ b/hosts @@ -1,2 +1,9 @@ +[common] +phoenix.thunix.cf +summit.thunix.cf + [shell] -thunix.tilde \ No newline at end of file +phoenix.thunix.cf + +[webserver] +summit.thunix.cf diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml index a4ea1ef..5aa5743 100644 --- a/roles/common/tasks/packages.yml +++ b/roles/common/tasks/packages.yml @@ -3,19 +3,7 @@ - name: Install baseline packages apt: name={{ item }} state=present with_items: - - vim - aptitude - git - - alpine - - weechat - - mutt - python - - rtv - - lynx - - w3m-img - - python-apt - - python - - python-pip - - cowsay - - byobu - man diff --git a/roles/common/tasks/users.yml b/roles/common/tasks/users.yml index d24e81e..5fe20dc 100644 --- a/roles/common/tasks/users.yml +++ b/roles/common/tasks/users.yml @@ -1,65 +1,5 @@ # This creates our users on the system --- -- group: - name: tilde - state: present - - group: name: sudo state: present - -- user: - name: testuser - groups: tilde - state: absent - shell: /bin/bash # Defaults to /bin/bash - system: no # Defaults to no - createhome: yes # Defaults to yes - home: /home/testuser - -- user: - name: amcclure - groups: tilde, sudo - state: present - skeleton: /etc/skel - shell: /bin/bash - system: no - createhome: yes - home: /home/amcclure -- authorized_key: - user: amcclure - state: present - key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsGEzYmXXveq7aGosnJR0I3h9zwPZTOr+ytnOiwPam2KhR9GBzZsAGxtpwXXdvIUtvGFV0tlDWZ851wAYvJsRzwOu7t4OgrtrxkC/qkZ+p9FyjQ4kBX3oSKWJ08J0K59uv3GrNVrVOzyqQ6aGb8TFgCnLN9C9ElWmdmyrZ3evbiraCov9HM8EpxCJN68nPz/ugJvIL6xZe+9+uGRzBrMrtbTPxTFi5SLHg1itPGFVRFJr8ZjOZ4temoZ9IKOi/EYP+FUPk+Xbg+6iaOpS0wlq2eQ+DpMFpsP+kHHiY7X1Ln4pMA4C8ewfqnFi6kI8VJtDFmuZgXlaV/Uq5T54zRzZt amcclure@tilde" -- authorized_key: - user: amcclure - state: present - key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDhdNCqJ2+kTVRdf9R2g4Uv9TKuQzY4LbtJm5V1dx7uMfNI8HGHOa8gFopAaId8S9SY5WoIP4R0y+avZQzKRAVcqJNiKrKQDb5juLSWgL51CrOgZd6Y/nCUnvgmpAEUBzlxIBSDmiozDF4R6fk+8MqXsT8/HOaQgXX52v4qWBY9XWSOFwCeukywpnENvNm+H3vJhHddIYtcONWJB5m6msrBRo5NR7uo5RVt5GJpUpXfdI2IHLV4YZavLWiT/yBbBvxCODKWkNNXr9jBZ5RHPnqYcABoAKJ6hMaNzuJfAa9AvlV5aRDhRenOiS2/EQhC4rxPMHmnfn4TYng7vQRbVTvnGeLNGtsLqRDWuNQEmLYUZ8Q4JZfoSzZVmSyy2NeLvJRYxQRh7NTZlzoDkY+JBURINPcfVduVT2DD0buFSdhIq7/jreV1QZuSpOa5ABgvhTOf9bCIPaqbJ/zK7m+rqIPUhvrNZGgC7xkUpzdfl67W3xh+RyEIPdJX98dYZ9bZFFYvntW+plHizBBs+s7kGTV7BKm4rJ2oQfTby1M3++tSTZi/6QAkcOEb3VJ5n0rQiM+FMLuHfP2dPXh3AIVKYAiwZjdrJ3174g8JjSTXt3jJm6I1KW89oG2AcBbI/N3bgIVXcU+IRx846+zU7iZ49YtJK61Ml7u9aVQJDABQEMg6OQ== amcclure@triton" - -- user: - name: naglfar - groups: tilde - state: present - skeleton: /etc/skel - shell: /bin/bash - system: no - createhome: yes - home: /home/naglafar - -- user: - name: ubergeek - groups: sudo - state: present - skeleton: /etc/skel - shell: /bin/bash - system: no - createhome: yes - home: /home/ubergeek - -- authorized_key: - user: ubergeek - state: present - key: "ssh-dss AAAAB3NzaC1kc3MAAACBAIBSqyxUGJOtsY+ri6SWRl7SyLO0dTK0uiTVWhzt/nzNGZsmvfSteasQGOrMpEgrnWDCm7XahH/AUg5IgSDmU7gKWITZVUqZGk8zZbqmx/qQuNqnte6J3vQvQK7M6qShVpnrLFdoEyrXjljAqGVVV4nyB0n+GBBJ1WlJN/eyJt3lAAAAFQDKpycDN2+ga6d53bYyReVVoOFcgwAAAIB4a4GPZsmJJc9bSnHU5j2pt6ThMS3yud//K46TGNF9vX5EXVrWk9XZc/iPwiXOnHfTu2uoVJiJkhJEM3SQY0YO0DoEqoCfwdZ+SisQeLDat/mvNduXO2PdVoKodXftwr1dq1HMD+0Wi+b17G1E/Gfx76ECfA3mBFvdsu8Wgo+I4wAAAIAy3QFkmetRKi/XjSMiiyJa1jxKiNyTO97eU2kLFyQE7LMQ6agDACPk3yfMdUgH7tvjfOBH5Tsp3wS+nvx1I7M5w08z88F9NBrp8Z2Ni2nACLtbY5q5oFr0a7ZnD+6LbWksK8NcTAquBnxf4FzXJ+knDfAg8Oya0sqR95VV5xoVTw== ubergeek@ubergeeks-MacBook-Pro.local" -- authorized_key: - user: ubergeek - state: present - key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdgDD3UMyI9NdtVGuuDS1Rqfw6YoJsctAhWgGP+0w6MX5Od0B3km6C/BaMe/ZY7vA861wjoeHFdZ69nOYsdDqysCLxZCAfGBjzYM2mS4UiuV3tnZA7C/Zd+dGUfuA64iQ1SJ3FcehGezgI9zJU2JSWfhzHO2gx7fdZ9lhCEDU3qkiXy6HFzd+B0+tlEXBSkUk4g47ZLuaKxPrqeug5xGLwjlMjTSYSyhODdjvYQNkaD4ynyggdq21T0CWA5abH4nol+NPy5HChYH7wkA0qQ23GeUrUfdWmzZxua6SBVEGC0cFiLLt0ZPCf2foob7Nse6W3ISy85uBKO4QNO5Nwl+zz ubergeek@yourtilde.com" diff --git a/roles/shell/files/resolv.conf b/roles/shell/files/resolv.conf new file mode 100644 index 0000000..3878a49 --- /dev/null +++ b/roles/shell/files/resolv.conf @@ -0,0 +1,2 @@ +nameserver 149.56.184.112 +nameserver 66.42.77.29 diff --git a/roles/shell/handlers/main.yml b/roles/shell/handlers/main.yml new file mode 100644 index 0000000..e69de29 diff --git a/roles/shell/meta/main.yml b/roles/shell/meta/main.yml new file mode 100644 index 0000000..e69de29 diff --git a/roles/shell/tasks/main.yml b/roles/shell/tasks/main.yml new file mode 100644 index 0000000..79c0805 --- /dev/null +++ b/roles/shell/tasks/main.yml @@ -0,0 +1,5 @@ +--- +# This playbook contains all of the common things every machine in the site gets. Basic packages, users, etc etc. + +- include: packages.yml +- include: users.yml diff --git a/roles/shell/tasks/packages.yml b/roles/shell/tasks/packages.yml new file mode 100644 index 0000000..8a0e03f --- /dev/null +++ b/roles/shell/tasks/packages.yml @@ -0,0 +1,16 @@ +# Install our baseline packages for all machines, irrespective of what role they might have +--- +- name: Install baseline packages + apt: name={{ item }} state=present + with_items: + - vim + - alpine + - weechat + - mutt + - python + - rtv + - lynx + - w3m-img + - python-pip + - cowsay + - byobu diff --git a/roles/shell/tasks/users.yml b/roles/shell/tasks/users.yml new file mode 100644 index 0000000..7409beb --- /dev/null +++ b/roles/shell/tasks/users.yml @@ -0,0 +1,56 @@ +# This creates our users on the system +--- +- group: + name: tilde + state: present + +- group: + name: sudo + state: present + +- user: + name: amcclure + groups: tilde, sudo + state: present + skeleton: /etc/skel + shell: /bin/bash + system: no + createhome: yes + home: /home/amcclure +- authorized_key: + user: amcclure + state: present + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsGEzYmXXveq7aGosnJR0I3h9zwPZTOr+ytnOiwPam2KhR9GBzZsAGxtpwXXdvIUtvGFV0tlDWZ851wAYvJsRzwOu7t4OgrtrxkC/qkZ+p9FyjQ4kBX3oSKWJ08J0K59uv3GrNVrVOzyqQ6aGb8TFgCnLN9C9ElWmdmyrZ3evbiraCov9HM8EpxCJN68nPz/ugJvIL6xZe+9+uGRzBrMrtbTPxTFi5SLHg1itPGFVRFJr8ZjOZ4temoZ9IKOi/EYP+FUPk+Xbg+6iaOpS0wlq2eQ+DpMFpsP+kHHiY7X1Ln4pMA4C8ewfqnFi6kI8VJtDFmuZgXlaV/Uq5T54zRzZt amcclure@tilde" +- authorized_key: + user: amcclure + state: present + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDhdNCqJ2+kTVRdf9R2g4Uv9TKuQzY4LbtJm5V1dx7uMfNI8HGHOa8gFopAaId8S9SY5WoIP4R0y+avZQzKRAVcqJNiKrKQDb5juLSWgL51CrOgZd6Y/nCUnvgmpAEUBzlxIBSDmiozDF4R6fk+8MqXsT8/HOaQgXX52v4qWBY9XWSOFwCeukywpnENvNm+H3vJhHddIYtcONWJB5m6msrBRo5NR7uo5RVt5GJpUpXfdI2IHLV4YZavLWiT/yBbBvxCODKWkNNXr9jBZ5RHPnqYcABoAKJ6hMaNzuJfAa9AvlV5aRDhRenOiS2/EQhC4rxPMHmnfn4TYng7vQRbVTvnGeLNGtsLqRDWuNQEmLYUZ8Q4JZfoSzZVmSyy2NeLvJRYxQRh7NTZlzoDkY+JBURINPcfVduVT2DD0buFSdhIq7/jreV1QZuSpOa5ABgvhTOf9bCIPaqbJ/zK7m+rqIPUhvrNZGgC7xkUpzdfl67W3xh+RyEIPdJX98dYZ9bZFFYvntW+plHizBBs+s7kGTV7BKm4rJ2oQfTby1M3++tSTZi/6QAkcOEb3VJ5n0rQiM+FMLuHfP2dPXh3AIVKYAiwZjdrJ3174g8JjSTXt3jJm6I1KW89oG2AcBbI/N3bgIVXcU+IRx846+zU7iZ49YtJK61Ml7u9aVQJDABQEMg6OQ== amcclure@triton" + +- user: + name: naglfar + groups: tilde + state: present + skeleton: /etc/skel + shell: /bin/bash + system: no + createhome: yes + home: /home/naglafar + +- user: + name: ubergeek + groups: tilde,sudo + state: present + skeleton: /etc/skel + shell: /bin/bash + system: no + createhome: yes + home: /home/ubergeek + +- authorized_key: + user: ubergeek + state: present + key: "ssh-dss AAAAB3NzaC1kc3MAAACBAIBSqyxUGJOtsY+ri6SWRl7SyLO0dTK0uiTVWhzt/nzNGZsmvfSteasQGOrMpEgrnWDCm7XahH/AUg5IgSDmU7gKWITZVUqZGk8zZbqmx/qQuNqnte6J3vQvQK7M6qShVpnrLFdoEyrXjljAqGVVV4nyB0n+GBBJ1WlJN/eyJt3lAAAAFQDKpycDN2+ga6d53bYyReVVoOFcgwAAAIB4a4GPZsmJJc9bSnHU5j2pt6ThMS3yud//K46TGNF9vX5EXVrWk9XZc/iPwiXOnHfTu2uoVJiJkhJEM3SQY0YO0DoEqoCfwdZ+SisQeLDat/mvNduXO2PdVoKodXftwr1dq1HMD+0Wi+b17G1E/Gfx76ECfA3mBFvdsu8Wgo+I4wAAAIAy3QFkmetRKi/XjSMiiyJa1jxKiNyTO97eU2kLFyQE7LMQ6agDACPk3yfMdUgH7tvjfOBH5Tsp3wS+nvx1I7M5w08z88F9NBrp8Z2Ni2nACLtbY5q5oFr0a7ZnD+6LbWksK8NcTAquBnxf4FzXJ+knDfAg8Oya0sqR95VV5xoVTw== ubergeek@ubergeeks-MacBook-Pro.local" +- authorized_key: + user: ubergeek + state: present + key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdgDD3UMyI9NdtVGuuDS1Rqfw6YoJsctAhWgGP+0w6MX5Od0B3km6C/BaMe/ZY7vA861wjoeHFdZ69nOYsdDqysCLxZCAfGBjzYM2mS4UiuV3tnZA7C/Zd+dGUfuA64iQ1SJ3FcehGezgI9zJU2JSWfhzHO2gx7fdZ9lhCEDU3qkiXy6HFzd+B0+tlEXBSkUk4g47ZLuaKxPrqeug5xGLwjlMjTSYSyhODdjvYQNkaD4ynyggdq21T0CWA5abH4nol+NPy5HChYH7wkA0qQ23GeUrUfdWmzZxua6SBVEGC0cFiLLt0ZPCf2foob7Nse6W3ISy85uBKO4QNO5Nwl+zz ubergeek@yourtilde.com" diff --git a/roles/shell/vars/main.yml b/roles/shell/vars/main.yml new file mode 100644 index 0000000..e69de29 diff --git a/roles/webserver/tasks/main.yml b/roles/webserver/tasks/main.yml index 61b68a5..ecfa5a4 100644 --- a/roles/webserver/tasks/main.yml +++ b/roles/webserver/tasks/main.yml @@ -4,4 +4,5 @@ - include: packages.yml - include: users.yml - include: apache.yml - - include: codedeploy.yml \ No newline at end of file + - include: codedeploy.yml + diff --git a/roles/webserver/tasks/packages.yml b/roles/webserver/tasks/packages.yml index e78af55..c53fabc 100644 --- a/roles/webserver/tasks/packages.yml +++ b/roles/webserver/tasks/packages.yml @@ -3,9 +3,6 @@ - name: Install wwww packages apt: name={{ item }} state=present with_items: - - aptitude - - git - - man - apache2 - mariadb-server - mariadb-client @@ -25,4 +22,4 @@ - php7.0-sqlite3 - php7.0-tidy - php7.0-xmlrpc - - php7.0-xsl \ No newline at end of file + - php7.0-xsl