Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update from upstream #1

Merged
merged 12 commits into from
Jan 18, 2020
Merged

Update from upstream #1

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
01c2e51
Explicitly setting the nginx configuration file in (#223)
timorunge Jun 15, 2018
55b3e78
Fixing Ansible 2.7.0 deprication warnings (#225)
timorunge Jun 19, 2018
ebef782
Small spelling correction (#228)
TheSycamore Jul 16, 2018
bdb4556
Add support to declare nginx modules in config file (#227)
q2digger Oct 5, 2018
a6aa5ed
Add task to remove `default.conf` from sites-enabled/ (#231)
neslinesli93 Oct 12, 2018
6863343
fix modules definition and add README section about this feature (#232)
q2digger Oct 17, 2018
02b950b
Fix typo in modules config and restrict to EPEL (#232) (#235)
perryk Jan 8, 2019
6bea4fc
Extends support for configuring modules (#236) (#237)
perryk Jan 13, 2019
c969677
Update README.md
jdauphant Oct 25, 2019
08ccfc5
download mime.types file if it's missing (#241)
tcrowe Nov 4, 2019
2124d5f
configuration: allow templates for conf.d independent files (#238)
paulrbr-fl Nov 4, 2019
868ad18
Fix for #242 Stick to ansible-lint rules. (#243)
bbaassssiiee Dec 30, 2019
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
Prev Previous commit
Next Next commit
Add task to remove default.conf from sites-enabled/ (jdauphant#231) 
* Add task to remove `default.conf` from sites-enabled/

* Check if `default` site is not inside user config
  • Loading branch information
@neslinesli93 @jdauphant
neslinesli93 authored and jdauphant committed Oct 12, 2018
commit a6aa5ed94a05ba84ec48a1e20bf203eafcbffe5a
9 changes: 9 additions & 0 deletions tasks/remove-defaults.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@
notify:
- reload nginx

- name: Disable the default site (on newer nginx versions)
file:
path: "{{nginx_conf_dir}}/sites-enabled/default.conf"
state: absent
notify:
- reload nginx
when: >
'default' not in nginx_sites.keys()
- name: Remove the default configuration
file:
path: "{{nginx_conf_dir}}/conf.d/default.conf"
Expand Down