Skip to content

Commit

Permalink
Feature/#27 (#48)
Browse files Browse the repository at this point in the history
* Release設定を作成

* Makefile修正

* 不要スペース削除

* スペースをタブに変更

* カラム順変更
  • Loading branch information
modockey authored Jun 18, 2024
1 parent 836dac3 commit fd7ed86
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 9 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
release-all:
make -C ./nginx release
make -C ./server/ip_register release
make -C ./server/api release
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,12 @@

### branch管理
当面はmainを基本ブランチとし、mainブランチに対してPull Requestを立てる。
開発時のブランチ名はIssue番号を用いて`feature/#{Issue番号}`とする。
開発時のブランチ名はIssue番号を用いて`feature/#{Issue番号}`とする。

## リリース方法

`Makefile`に全機能のリリースコマンドが記載されており、以下で全機能を更新することができる。

```
make release-all
```
2 changes: 1 addition & 1 deletion database/ddl.sql
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ create table ipv4_history (
id serial,
ipv4_address varchar(15) not null,
effective_flg boolean not null,
last_checked_at timestamptz not null,
created_at timestamptz not null,
updated_at timestamptz not null,
last_checked_at timestamptz not null,
PRIMARY KEY (id)
);
6 changes: 2 additions & 4 deletions database/dml.sql
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,16 @@ insert into
id,
ipv4_address,
effective_flg,
created_at,
last_checked_at created_at,
updated_at,
last_checked_at
)
values
(
1,
'111.111.111.111',
false,
'2022-01-01 00:00:00Z',
'2022-01-01 00:00:00Z',
'2022-01-01 00:00:00Z'
'2022-01-01 00:00:00Z' '2022-01-01 00:00:00Z',
),
(
2,
Expand Down
7 changes: 5 additions & 2 deletions nginx/reverse_proxy.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,17 @@ server {
ssl_certificate /etc/letsencrypt/live/modockey.mydns.jp/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/modockey.mydns.jp/privkey.pem;

location /home-management/api/v1/ {
# server/api下のAPI
location /pi-home/api/v1/ {
proxy_pass http://localhost:50001/v1/;
proxy_redirect off;
}
location /home-management/ {
# React
location /pi-home/ {
proxy_pass http://localhost:50080/;
proxy_redirect off;
}
#pukiwikiに飛ばす
location / {
proxy_pass http://localhost:58080/;
proxy_redirect off;
Expand Down
2 changes: 1 addition & 1 deletion server/api/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ release-systemd:

release: release-build release-systemd
systemctl stop home-management-api.service
sudo systemctl daemon-reload
sudo systemctl daemon-reload
sudo mkdir -p /usr/local/bin/home-management-api
sudo cp ./target/release/openapi_client /usr/local/bin/home-management-api/
systemctl start home-management-api.service
Expand Down

0 comments on commit fd7ed86

Please sign in to comment.