Skip to content

Commit

Permalink
Add nginx role
Browse files Browse the repository at this point in the history
  • Loading branch information
jochenklar committed Jul 3, 2019
1 parent 527845a commit c8d325b
Show file tree
Hide file tree
Showing 11 changed files with 111 additions and 14 deletions.
2 changes: 2 additions & 0 deletions main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@
tags: ['ssh']
- role: packages
tags: ['packages']
- role: nginx
tags: ['nginx']
28 changes: 21 additions & 7 deletions roles/config/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
---

- name: red prompt for root
lineinfile: dest=/root/.bashrc line="export PS1='[\[\e[0;31m\]\u@\h\[\e[0m\] \W]\$ '"
lineinfile:
dest: /root/.bashrc
line: "export PS1='[\\[\\e[0;31m\\]\\u@\\h\\[\\e[0m\\] \\W]\\$ '"

- name: include .bash_aliases in /root/.bashrc
lineinfile: dest=/root/.bashrc line="source /root/.bash_aliases"
lineinfile:
dest: /root/.bashrc
line: "source /root/.bash_aliases"

- name: /root/.bash_aliases
copy: src=bash_aliases dest=/root/.bash_aliases
copy:
src: bash_aliases
dest: /root/.bash_aliases

- name: /root/.emacs
copy: src=emacs dest=/root/.emacs
copy:
src: emacs
dest: /root/.emacs

- name: include .bash_aliases in /home/ubuntu/.bashrc
lineinfile: dest=/home/ubuntu/.bashrc line="source /home/ubuntu/.bash_aliases"
lineinfile:
dest: /home/ubuntu/.bashrc
line: "source /home/ubuntu/.bash_aliases"

- name: /home/ubuntu/.bash_aliases
copy: src=bash_aliases dest=/home/ubuntu/.bash_aliases
copy:
src: bash_aliases
dest: /home/ubuntu/.bash_aliases

- name: /home/ubuntu/.emacs
copy: src=emacs dest=/home/ubuntu/.emacs
copy:
src: emacs
dest: /home/ubuntu/.emacs
17 changes: 17 additions & 0 deletions roles/nginx/files/data.isimip.org.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
server {
listen 80 default_server;
listen [::]:80 default_server;

# listen 443 ssl default_server;
# listen [::]:443 ssl default_server;

root /var/www/html;

index index.html;

server_name data.isimip.org;

location / {
try_files $uri $uri/ =404;
}
}
17 changes: 17 additions & 0 deletions roles/nginx/files/files.isimip.org.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
server {
listen 80 default_server;
listen [::]:80 default_server;

# listen 443 ssl default_server;
# listen [::]:443 ssl default_server;

root /var/www/html;

index index.html;

server_name files.isimip.org;

location / {
try_files $uri $uri/ =404;
}
}
6 changes: 6 additions & 0 deletions roles/nginx/handlers/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---

- name: restart nginx
service:
name: nginx
state: restarted
16 changes: 16 additions & 0 deletions roles/nginx/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---

- name: nginx is installed
apt: name=nginx state=present

- name: nginx config is present
copy:
src: "{{ ansible_host }}.conf"
dest: /etc/nginx/sites-available/default
notify:
- restart nginx

- name: index.html is present
template:
src: index.html
dest: /var/www/html/index.html
16 changes: 16 additions & 0 deletions roles/nginx/templates/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<html>

<head>
<title>{{ ansible_host }}</title>
<meta charset="UTF-8" />

<style>
body {font-family: sans;}
</style>
</head>

<body>
<h1>{{ ansible_host }}</h1>
</body>

</html>
8 changes: 6 additions & 2 deletions roles/packages/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
---

- name: all packages are on the latest version
apt: update_cache=yes upgrade=dist
apt:
upgrade: dist
update_cache: yes

- name: common packages are present
apt: name="{{ packages }}" state=present
apt:
name: "{{ packages }}"
state: present
1 change: 1 addition & 0 deletions roles/packages/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---

packages:
- aptitude
- sudo
Expand Down
3 changes: 0 additions & 3 deletions roles/ssh/handlers/main.yml

This file was deleted.

11 changes: 9 additions & 2 deletions roles/ssh/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
---

- name: ssh keys for root
authorized_key: user=root key="{{ item }}" state=present
authorized_key:
user: root
key: "{{ item }}"
state: present
with_file:
- [email protected]
- [email protected]

- name: ssh keys for ubuntu
authorized_key: user=ubuntu key="{{ item }}" state=present
authorized_key:
user: ubuntu
key: "{{ item }}"
state: present
with_file:
- [email protected]
- [email protected]

0 comments on commit c8d325b

Please sign in to comment.