Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
thegreatsunra committed Dec 28, 2018
2 parents 5002c63 + 30f0db9 commit 750f461
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.0.1
6 changes: 3 additions & 3 deletions scripts/cloud-init.sh.txt
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ runcmd:
## Add the sites-available and sites-enabled folders because the nginx mainline doesn't have them
- mkdir /etc/nginx/sites-available /etc/nginx/sites-enabled
## Grab our nginx sites-available config files off GitHub Gist and make 'em
- curl https://raw.githubusercontent.com/thegreatsunra/lemp-cloud-init/feature/use-ubuntu-1804/templates/etc/nginx/sites-available/domain.tld.txt -o /etc/nginx/sites-available/__domain.tld__
- curl https://raw.githubusercontent.com/thegreatsunra/lemp-cloud-init/1.0.1/templates/etc/nginx/sites-available/domain.tld.txt -o /etc/nginx/sites-available/__domain.tld__
## Symlink all server block sites-available definition files in the sites-enabled folder:
- ln -s /etc/nginx/sites-available/__domain.tld__ /etc/nginx/sites-enabled/
## Change owner of public web server files to default user:
Expand All @@ -357,12 +357,12 @@ runcmd:
## Back up our original nginx configuration file:
- mv /etc/nginx/nginx.conf /etc/nginx/nginx.original
## Grab our new nginx configuration file:
- curl https://raw.githubusercontent.com/thegreatsunra/lemp-cloud-init/feature/use-ubuntu-1804/templates/etc/nginx/nginx.conf.txt -o /etc/nginx/nginx.conf
- curl https://raw.githubusercontent.com/thegreatsunra/lemp-cloud-init/1.0.1/templates/etc/nginx/nginx.conf.txt -o /etc/nginx/nginx.conf
## Replace the placeholder username in our nginx config with
- sed -i -e 's/user[ ]*__placeholder_username__/user __username__/' /etc/nginx/nginx.conf
## Update fastcgi_params for PHP
- mv /etc/nginx/fastcgi_params /etc/nginx/fastcgi_params.original
- curl https://raw.githubusercontent.com/thegreatsunra/lemp-cloud-init/feature/use-ubuntu-1804/templates/etc/nginx/fastcgi_params.txt -o /etc/nginx/fastcgi_params
- curl https://raw.githubusercontent.com/thegreatsunra/lemp-cloud-init/1.0.1/templates/etc/nginx/fastcgi_params.txt -o /etc/nginx/fastcgi_params
## Test our nginx config
- nginx -t
## Change php user and group to new user
Expand Down

0 comments on commit 750f461

Please sign in to comment.