Commit Graph

310 Commits

Author SHA1 Message Date
e4282e28d7 Delete unnecesary supervisord steps. 2023-01-28 10:37:37 +09:00
6f48a84591 Delete supervisord config for Consul. 2023-01-28 10:37:37 +09:00
bde351eb5f Update /etc/grafana/grafana.ini setting. 2023-01-28 10:37:37 +09:00
89e2103696 Change nginx build option. 2023-01-28 10:37:37 +09:00
114e10758a Update /etc/lego/lego_run.sh. 2023-01-28 10:37:37 +09:00
947cf0eb9d Bump nginx version. 2023-01-28 10:37:37 +09:00
a00dd97b81 Properly handle HTTP 301 redirection. 2023-01-28 10:37:37 +09:00
1943fb5f09 Change logic to deploy /etc/systemd/timesyncd.conf. 2023-01-28 10:37:37 +09:00
1875e14f29 Update /etc/dnsmasq.conf & /etc/systemd/resolved.conf for Ubuntu 22.04. 2023-01-28 10:37:37 +09:00
c40dc83965 Update sshd_config & deploy sshd_config for Ubuntu 22.04: 2023-01-28 10:37:37 +09:00
78b98cdab6 Update 50unattended-upgrades and deploy 2023-01-28 10:37:37 +09:00
a773b4a1b5 Install systemd-timesyncd and add its config file:
```
--- a/cookbooks/base/default.rb
+++ b/cookbooks/base/default.rb
@@ -80,6 +80,20 @@
 when "20.04", "22.04"
   service 'multipath-tools' do
     action :nothing
   end
+
+  package 'systemd-timesyncd'
+
+  service 'systemd-timesyncd' do
+    action :enable
+  end
+
+  remote_file '/etc/systemd/timesyncd.conf' do
+    owner 'root'
+    group 'root'
+    mode '0644'
+
+    notifies :restart, 'service[systemd-timesyncd]'
+  end
 end
```
2023-01-28 10:37:37 +09:00
11bdc70327 Use node['platform_version'] & support Ubuntu 22.04 for timezone setting: 2023-01-28 10:37:37 +09:00
c6bfa2c09b Delete the recipes for Ubuntu 16.04. 2023-01-28 10:37:37 +09:00
6f18eed04e Change the public key of HashiCorp apt key. 2023-01-28 10:34:54 +09:00
320d990b51 Modify mc config. 2023-01-15 20:27:00 +09:00
825fc30121 バージョンアップに伴い、Vectorの設定ファイルを修正 2022-12-30 12:10:38 +09:00
6162f0171e Install embulk-filter-eval gem:
```
--- a/cookbooks/embulk/setup.rb
+++ b/cookbooks/embulk/setup.rb
@@ -32,7 +32,7 @@ remote_file '/root/.ssh/config' do
 end

-%w(filter-column filter-row output-mysql output-postgresql input-mysql filter-gsub).each do |p|
+%w(filter-column filter-row output-mysql output-postgresql input-mysql filter-gsub filter-eval).each do |p|
   execute "embulk gem install embulk-#{p}" do
     user 'root'
```
2022-08-18 21:40:21 +09:00
f34dfa1445 Do not install rclone. 2022-08-18 21:31:34 +09:00
bc2f8128ff apt updateコマンドの実行回数を減らす 2022-08-11 12:21:39 +09:00
9d4cccb842 Modify permission of git hook. 2022-08-07 20:49:37 +09:00
8f63c7bf3f Deploy config file for starship. 2022-08-07 20:43:15 +09:00
a42048cc7d Install starship. 2022-08-07 20:43:15 +09:00
23dfb61e2d Change the git repository to gitea.kazu634.com. 2022-08-07 20:39:54 +09:00
ecf50c2bbc Deploy logrotate config for consul-template. 2022-08-06 21:34:48 +09:00
4daca5a1cc Install embulk version 0.9.24:
```
--- a/cookbooks/embulk/attributes.rb
+++ b/cookbooks/embulk/attributes.rb
@@ -7,7 +7,7 @@ ipaddr = run_command(cmd).stdout.chomp
 node.reverse_merge!({
   'embulk' => {
     'base_binary_url' => 'https://github.com/embulk/embulk/releases/download/v',
-    'version' => '0.9.23',
+    'version' => '0.9.24',
     'extension' => '.jar',
     'install_path' => '/opt/embulk'
   }
```
2022-07-18 22:22:01 +09:00
a661d3cf0d Install OpenJDK 8 for Ubuntu 22.04. 2022-07-18 22:21:35 +09:00
f7b2c6bad1 Add -y option flag to add-apt-repository
Due to the behaviour change, need to add `-y` option for
`add-apt-repository` command to operate without human interactions.
2022-07-18 10:57:33 +09:00
91a0c444b5 Modify consul-template directories:
```
--- a/cookbooks/consul-template/setup.rb
+++ b/cookbooks/consul-template/setup.rb
@@ -1,6 +1,6 @@
 # Create `/var/log/vector`:
-%w( /etc/consul-template.d/conf /etc/consul-template.d/templates ).each do |d|
-  directory d do
+%w( conf templates tokens ).each do |d|
+  directory "/etc/consul-template.d/#{d}" do
     owner  'root'
     group  'root'
     mode   '0755'
```
2022-07-10 16:35:21 +09:00
956cf439ee Modify indent. 2022-07-10 16:28:49 +09:00
73f7ec44b7 Enable Consul Connect for client side. 2022-07-10 16:22:28 +09:00
37d51b5ed5 Create /etc/vault.d/agent & /etc/vault.d/tokens directory.
```
--- a/cookbooks/vault/default.rb
+++ b/cookbooks/vault/default.rb
@@ -2,6 +2,14 @@ include_recipe './attributes.rb'

 include_recipe './install.rb'

+%w( agent tokens ).each do |d|
+  directory "/etc/vault.d/#{d}" do
+    owner 'vault'
+    group 'vault'
+    mode '0755'
+  end
+end
+
 if node['vault']['manager']
   include_recipe './setup.rb'
 end
```
2022-07-10 16:22:28 +09:00
48702191fe Allow Consul gcp port to communicate.
```
--- a/cookbooks/consul/setup.rb
+++ b/cookbooks/consul/setup.rb
@@ -44,7 +44,7 @@ service 'consul' do
 end

 # iptables settings here:
-%w( 8300/tcp 8301/tcp 8301/udp 8500/tcp ).each do |port|
+%w( 8300/tcp 8301/tcp 8301/udp 8500/tcp 8502/tcp ).each do |port|
   execute "ufw allow #{port}" do
     user 'root'
```
2022-07-10 16:22:28 +09:00
c15c2f3de8 Start Consul after Vault generates the jwt token.
```
--- a/cookbooks/consul/files/etc/systemd/system/consul.service
+++ b/cookbooks/consul/files/etc/systemd/system/consul.service
@@ -2,7 +2,7 @@
 Description="HashiCorp Consul - A service mesh solution"
 Documentation=https://www.consul.io/
 Requires=network-online.target
-After=network-online.target
+After=network-online.target vault-agent-consul-jwt.target
 ConditionFileNotEmpty=/etc/consul.d/consul.hcl

 [Service]
```
2022-07-10 16:22:28 +09:00
94489f71d5 Modify consul.hcl template to support Consul Connect. 2022-07-10 16:22:28 +09:00
43fbbe1f18 Support Ubuntu 22.04. 2022-07-10 14:32:35 +09:00
ba7d01f16d Modify the logic to decide the download URL. 2022-07-03 21:36:19 +09:00
8f09026fed Modify Github repository URI from git to https. 2022-07-03 21:29:46 +09:00
4455fe6b62 Deploy /etc/logrotate.d/vault. 2022-07-02 11:40:31 +00:00
4a57c21614 Deploy example Consul Connect job. 2022-03-14 23:19:25 +09:00
ef40d3dc01 Create /etc/nomad.d/jobs 2022-03-14 23:19:25 +09:00
9a5a78d657 Deploy /etc/nomad.d/policies/anonymous.hcl. 2022-03-14 23:19:25 +09:00
ce7a80db7a Create /etc/nomad.d/policies/ directory. 2022-03-14 23:17:44 +09:00
a882f52b3f Delete shared_dir.rb. 2022-03-14 23:17:32 +09:00
64066ab78f Add consul stanza. 2022-03-14 23:17:12 +09:00
3bd4973c90 Deploy Vault policies. 2022-03-13 21:48:27 +09:00
cf79f30c4d Create /etc/vault.d/policies/. 2022-03-13 21:46:00 +09:00
da78e76d19 Deploy /etc/vault.d/vault.hcl. 2022-03-13 21:45:36 +09:00
7681522b6b Specify the default Vault managers.
```
--- a/cookbooks/vault/attributes.rb
+++ b/cookbooks/vault/attributes.rb
@@ -21,5 +21,6 @@ node.reverse_merge!({
     'manager' => false,
     'ipaddr' => ipaddr,
     'hostname' => hostname,
+    'ips' => ['192.168.10.141', '192.168.10.142', '192.168.10.143'],
   }
 })
```
2022-03-13 21:45:17 +09:00
67fab4951a Retrieve hostname. 2022-03-13 21:45:01 +09:00