Skip to content

Commit 4fddc9c

Browse files
[Release] RC-0.2.1 (#2120)
* Added note for option to use either ssl or starttls (gsuite w/postfix) (#2042) * Added note for using ssl or starttls * Copy edit fixes * Update index.md (#2049) * Updated resizing a inode images to reflect new plans (#2059) * Salt command line reference add'l copy edits (#2061) * Initial Commit * Spelling corrections. * More spelling corrections. * edited salt CLI reference * [NEW] Migrating from Tokyo 1 to Tokyo 2 (#2046) * [NEW] Migrating from Tokyo 1 to Tokyo 2 * Fix for early migration sequence description * Copy Edits * Adding CloudFlare to list of DNS update doc links * Fixing links * Fixed description front matter * Remove sentence (#2069) * changed LetsEncrypt link (#2054) Changed the LetsEncrypt link from pointing to their homepage to pointing to Linode's guide on Let's Encrypt. * Revert "changed LetsEncrypt link (#2054)" (#2057) This reverts commit e5478aa. * Updated to include Tokyo 2 (#2067) * remove sentence Removed a bad sentence * Deprecated Django Guide (#2072) * Jinja intro research and write * Tech Edit * Fix typo (#2079) * Update Terraform for Linode provider. * Fixed issues with the wireguard guide and the fully-managed guide (#2083) * Removed a reference to legacy billing (#2084) * Added a link to the images guide promoting our image feature (#2085) * Added a link to the images guide promoting our image feature * Travis * [UPDATE] salt cloud v3 API note and size names (#2073) * [UPDATE] salt cloud v3 API note and size names [UPDATE] salt cloud v3 API note and curl test [UPDATE] salt cloud use size Nanode 1GB not Linode 1024 [UPDATE] salt cloud modified date * [UPDATE] salt cloud fixup linode.map file location * sshd service restart - error (#2068) sshd should be used instead of ssh in centos (I don't know about other distros * linux-hardened kernel support was dropped. (#2065) Alpine dropped support for grsec's hardened linux kernel. It is no longer part of the distribution. see: https://git.alpinelinux.org/cgit/aports/commit/?id=94a65a421705eb0152c2a6cdeb0bffd269c58e97 * Update dd command call in "Backup & Restore" (#2052) When following this guide, I ran into an issue where running the following command in "Backup & Restore" zeroed the entire block device: > dd if=/dev/zero of=/dev/sdX bs=128 count=1 I updated the command to: > dd conv=notrunc if=/dev/zero of=/dev/sdX bs=128 count=1 Using the updated command, only the header portion of the device is zeroed out and can be successfully restored from backup in the rest of the example. * Terminal outputs corrected and a few other edits * Guaris patch 1 (#2087) * Update index.md * Update index.md * Quick fix GitHub issues. (#2088) * Tech Edits * Copy edit complete * Remove trailing whitespace * Fixing Linode group label (minor fix) * [NEW] Automate Static Site Deployments with Salt, Git, and Webhooks (#2089) * Draft complete * Tech Edit * Blueberry fixes * Copy Edits * [New] Create a Salt Execution Module (#2064) * Initial Commit * Spelling Corrections * Added Another Resource * Tech Edit * Copy edit * [New] Monitoring Salt Minions with Beacons (#2070) * Initial Commit * Spelling corrections and YAML corrections Added 'highstate' to dictionary 'modified' YAML * Fixed opening sentence * Tech edits * Copy edit * Copy edit * Correct dirname * [Fix ] Billings and payments anchor (#2096) * Fix link in billing and payments * Add links to network quota guide * Remove unwanted carriage return * Update index.md (#2091) * Review edits * Rename guide path to match new title * [NEW] A Beginner's Guide to Salt (#2078) * Beginner guide to salt * Tech Edit * Tech Edit 2 * Copy edit finished * Blueberry fixes and some last copy edits * Accidentally deleted some of my original copy edits in last commit, reverting that * Small wording change * Bolding the definition of configuration management * Clarifying wording * Clarifying wording 2 * Fix trailing whitespace * Fix links and spelling * Small copy edits * Vale threw up a bunch of spelling errors in unrelated guides after the merge * More spelling fix * More spelling fixes 2 * Remove Magnifying Glass (#2098) * Added Note About CentOS 7 Support (#2107) Instructed reader that CentOS 7 is supported experimentally and that they should checkout the official documentation. * Fix command for package version * Add deprecated link to config wordpress guide * Removing single quotes from deprecated_link
1 parent 47451c6 commit 4fddc9c

File tree

46 files changed

+2630
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2630
-66
lines changed

ci/vale/dictionary.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ addons
88
addr
99
adduser
1010
adminpack
11+
adnanh
1112
adodb
1213
aes
1314
ahci0
@@ -127,6 +128,7 @@ certbot
127128
certcheck
128129
cfg
129130
cgi
131+
chainable
130132
changelog
131133
changelogs
132134
changeme
@@ -213,6 +215,7 @@ daemonizes
213215
daemonizing
214216
daemonset
215217
dahdi
218+
datacenter
216219
datadir
217220
dataset
218221
datasets
@@ -240,6 +243,7 @@ defragment
240243
deprovisioning
241244
descolada
242245
descr
246+
deserialize
243247
dest
244248
dev
245249
devel
@@ -387,6 +391,7 @@ framesets
387391
freedns
388392
friendster
389393
frontend
394+
frontmatter
390395
fs
391396
fsck
392397
fstab
@@ -473,6 +478,7 @@ heartbleed
473478
heroku
474479
hexo
475480
hiera
481+
highstate
476482
hilights
477483
hl2
478484
hl2
@@ -711,6 +717,7 @@ mapreduce
711717
mariadb
712718
maskname
713719
masterdb
720+
masterless
714721
mathematica
715722
mathjax
716723
maxconn
@@ -1054,6 +1061,7 @@ resolvconf
10541061
resque
10551062
restapi
10561063
retpoline
1064+
reusability
10571065
reutilize
10581066
richlanguage
10591067
rimap
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
hugo_group:
2+
group.present:
3+
- name: {{ pillar['hugo_deployment_data']['group'] }}
4+
5+
hugo_user:
6+
user.present:
7+
- name: {{ pillar['hugo_deployment_data']['user'] }}
8+
- gid: {{ pillar['hugo_deployment_data']['group'] }}
9+
- home: {{ pillar['hugo_deployment_data']['home_dir'] }}
10+
- createhome: True
11+
- require:
12+
- group: hugo_group
13+
14+
hugo_site_repo:
15+
cmd.run:
16+
- name: git clone --recurse-submodules https://github.com/{{ pillar['hugo_deployment_data']['github_account'] }}/{{ pillar['hugo_deployment_data']['site_repo_name'] }}.git
17+
- cwd: {{ pillar['hugo_deployment_data']['home_dir'] }}
18+
- runas: {{ pillar['hugo_deployment_data']['user'] }}
19+
- creates: {{ pillar['hugo_deployment_data']['home_dir'] }}/{{ pillar['hugo_deployment_data']['site_repo_name'] }}
20+
- require:
21+
- pkg: git_pkg
22+
- user: hugo_user
23+
24+
nginx_default:
25+
file.absent:
26+
- name: '/etc/nginx/sites-enabled/default'
27+
- require:
28+
- pkg: nginx_pkg
29+
30+
nginx_config:
31+
file.managed:
32+
- name: /etc/nginx/sites-available/hugo_site
33+
- source: salt://hugo/files/hugo_site
34+
- user: root
35+
- group: root
36+
- mode: 0644
37+
- template: jinja
38+
- require:
39+
- pkg: nginx_pkg
40+
41+
nginx_symlink:
42+
file.symlink:
43+
- name: /etc/nginx/sites-enabled/hugo_site
44+
- target: /etc/nginx/sites-available/hugo_site
45+
- user: root
46+
- group: root
47+
- require:
48+
- file: nginx_config
49+
50+
nginx_document_root:
51+
file.directory:
52+
- name: {{ pillar['hugo_deployment_data']['nginx_document_root'] }}/{{ pillar['hugo_deployment_data']['site_repo_name'] }}
53+
- user: {{ pillar['hugo_deployment_data']['user'] }}
54+
- group: {{ pillar['hugo_deployment_data']['group'] }}
55+
- dir_mode: 0755
56+
- require:
57+
- user: hugo_user
58+
59+
build_script:
60+
file.managed:
61+
- name: {{ pillar['hugo_deployment_data']['home_dir'] }}/deploy.sh
62+
- source: salt://hugo/files/deploy.sh
63+
- user: {{ pillar['hugo_deployment_data']['user'] }}
64+
- group: {{ pillar['hugo_deployment_data']['group'] }}
65+
- mode: 0755
66+
- template: jinja
67+
- require:
68+
- user: hugo_user
69+
cmd.run:
70+
- name: ./deploy.sh
71+
- cwd: {{ pillar['hugo_deployment_data']['home_dir'] }}
72+
- runas: {{ pillar['hugo_deployment_data']['user'] }}
73+
- creates: {{ pillar['hugo_deployment_data']['nginx_document_root'] }}//{{ pillar['hugo_deployment_data']['site_repo_name'] }}/index.html
74+
- require:
75+
- file: build_script
76+
- cmd: hugo_site_repo
77+
- file: nginx_document_root
78+
79+
webhook_systemd_unit:
80+
file.managed:
81+
- name: '/etc/systemd/system/webhook.service'
82+
- source: salt://hugo/files/webhook.service
83+
- user: root
84+
- group: root
85+
- mode: 0644
86+
- template: jinja
87+
- require:
88+
- pkg: webhook_pkg
89+
module.run:
90+
- name: service.systemctl_reload
91+
- onchanges:
92+
- file: webhook_systemd_unit
93+
94+
webhook_config:
95+
file.managed:
96+
- name: '/etc/webhook.conf'
97+
- source: salt://hugo/files/webhook.conf
98+
- user: root
99+
- group: {{ pillar['hugo_deployment_data']['group'] }}
100+
- mode: 0640
101+
- template: jinja
102+
- require:
103+
- pkg: webhook_pkg
104+
- group: hugo_group
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
hugo_group:
2+
group.present:
3+
- name: {{ pillar['hugo_deployment_data']['group'] }}
4+
5+
hugo_user:
6+
user.present:
7+
- name: {{ pillar['hugo_deployment_data']['user'] }}
8+
- gid: {{ pillar['hugo_deployment_data']['group'] }}
9+
- home: {{ pillar['hugo_deployment_data']['home_dir'] }}
10+
- createhome: True
11+
- require:
12+
- group: hugo_group
13+
14+
hugo_site_repo:
15+
cmd.run:
16+
- name: git clone --recurse-submodules https://github.com/{{ pillar['hugo_deployment_data']['github_account'] }}/{{ pillar['hugo_deployment_data']['site_repo_name'] }}.git
17+
- cwd: {{ pillar['hugo_deployment_data']['home_dir'] }}
18+
- runas: {{ pillar['hugo_deployment_data']['user'] }}
19+
- creates: {{ pillar['hugo_deployment_data']['home_dir'] }}/{{ pillar['hugo_deployment_data']['site_repo_name'] }}
20+
- require:
21+
- pkg: git_pkg
22+
- user: hugo_user
23+
24+
nginx_default:
25+
file.absent:
26+
- name: '/etc/nginx/sites-enabled/default'
27+
- require:
28+
- pkg: nginx_pkg
29+
30+
nginx_config:
31+
file.managed:
32+
- name: /etc/nginx/sites-available/hugo_site
33+
- source: salt://hugo/files/hugo_site
34+
- user: root
35+
- group: root
36+
- mode: 0644
37+
- template: jinja
38+
- require:
39+
- pkg: nginx_pkg
40+
41+
nginx_symlink:
42+
file.symlink:
43+
- name: /etc/nginx/sites-enabled/hugo_site
44+
- target: /etc/nginx/sites-available/hugo_site
45+
- user: root
46+
- group: root
47+
- require:
48+
- file: nginx_config
49+
50+
nginx_document_root:
51+
file.directory:
52+
- name: {{ pillar['hugo_deployment_data']['nginx_document_root'] }}/{{ pillar['hugo_deployment_data']['site_repo_name'] }}
53+
- user: {{ pillar['hugo_deployment_data']['user'] }}
54+
- group: {{ pillar['hugo_deployment_data']['group'] }}
55+
- dir_mode: 0755
56+
- require:
57+
- user: hugo_user
58+
59+
build_script:
60+
file.managed:
61+
- name: {{ pillar['hugo_deployment_data']['home_dir'] }}/deploy.sh
62+
- source: salt://hugo/files/deploy.sh
63+
- user: {{ pillar['hugo_deployment_data']['user'] }}
64+
- group: {{ pillar['hugo_deployment_data']['group'] }}
65+
- mode: 0755
66+
- template: jinja
67+
- require:
68+
- user: hugo_user
69+
cmd.run:
70+
- name: ./deploy.sh
71+
- cwd: {{ pillar['hugo_deployment_data']['home_dir'] }}
72+
- runas: {{ pillar['hugo_deployment_data']['user'] }}
73+
- creates: {{ pillar['hugo_deployment_data']['nginx_document_root'] }}//{{ pillar['hugo_deployment_data']['site_repo_name'] }}/index.html
74+
- require:
75+
- file: build_script
76+
- cmd: hugo_site_repo
77+
- file: nginx_document_root
109 KB
Loading
102 KB
Loading
168 KB
Loading
162 KB
Loading
28.1 KB
Loading
49.1 KB
Loading
31.9 KB
Loading

0 commit comments

Comments
 (0)