mirror of
https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git
synced 2026-02-04 12:32:45 +03:00
Move Tiny Cloud configs into /etc
This commit is contained in:
parent
cdae70909c
commit
83e8677481
@ -4,5 +4,7 @@
|
|||||||
|
|
||||||
***WARNING:*** The behavior of **mdev-conf** is slightly different -- only **/dev/sd** or **/dev/xvd** symlinks are created, *not both*!
|
***WARNING:*** The behavior of **mdev-conf** is slightly different -- only **/dev/sd** or **/dev/xvd** symlinks are created, *not both*!
|
||||||
|
|
||||||
|
* Tiny Cloud configuration has moved to **/etc/tiny-cloud.conf**.
|
||||||
|
|
||||||
----
|
----
|
||||||
_CHANGELOG begins 2023-04-29_
|
_CHANGELOG begins 2023-04-29_
|
||||||
|
|||||||
3
Makefile
3
Makefile
@ -15,7 +15,7 @@ core:
|
|||||||
lib/tiny-cloud/mdev \
|
lib/tiny-cloud/mdev \
|
||||||
lib/tiny-cloud/tiny-cloud.conf
|
lib/tiny-cloud/tiny-cloud.conf
|
||||||
install -Dm644 lib/tiny-cloud/tiny-cloud.conf \
|
install -Dm644 lib/tiny-cloud/tiny-cloud.conf \
|
||||||
"$(PREFIX)"/etc/conf.d/tiny-cloud
|
"$(PREFIX)"/etc/tiny-cloud.conf
|
||||||
|
|
||||||
network:
|
network:
|
||||||
install -Dm644 -t "$(PREFIX)"/etc/network/interfaces.d \
|
install -Dm644 -t "$(PREFIX)"/etc/network/interfaces.d \
|
||||||
@ -69,4 +69,3 @@ Kyuafile:
|
|||||||
echo "test_suite('tiny-cloud')" >> $@.tmp
|
echo "test_suite('tiny-cloud')" >> $@.tmp
|
||||||
echo "include('tests/Kyuafile')" >> $@.tmp
|
echo "include('tests/Kyuafile')" >> $@.tmp
|
||||||
mv $@.tmp $@
|
mv $@.tmp $@
|
||||||
|
|
||||||
|
|||||||
@ -81,7 +81,7 @@ rc-update add tiny-cloud-final default
|
|||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
By default, Tiny Cloud expects configuration at `/etc/conf.d/tiny-cloud`,
|
By default, Tiny Cloud expects configuration at `/etc/tiny-cloud.conf`,
|
||||||
The stock [lib/tiny-cloud/tiny-cloud.conf`](lib/tiny-cloud/tiny-cloud.conf)
|
The stock [lib/tiny-cloud/tiny-cloud.conf`](lib/tiny-cloud/tiny-cloud.conf)
|
||||||
file contains details of all tuneable settings.
|
file contains details of all tuneable settings.
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
# vim: ts=4 et ft=sh:
|
# vim: ts=4 et ft=sh:
|
||||||
|
|
||||||
# set defaults
|
# set defaults
|
||||||
[ -f "$ROOT"/etc/conf.d/tiny-cloud ] && . "$ROOT"/etc/conf.d/tiny-cloud
|
[ -f "$ROOT"/etc/tiny-cloud.conf ] && . "$ROOT"/etc/tiny-cloud.conf
|
||||||
: "${CLOUD:=unknown}"
|
: "${CLOUD:=unknown}"
|
||||||
: "${CLOUD_USER:=alpine}"
|
: "${CLOUD_USER:=alpine}"
|
||||||
: "${TINY_CLOUD_LOGS:=$ROOT/var/log}"
|
: "${TINY_CLOUD_LOGS:=$ROOT/var/log}"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# Tiny Cloud configuration
|
# Tiny Cloud configuration
|
||||||
# /etc/conf.d/tiny-cloud
|
# /etc/tiny-cloud.conf
|
||||||
|
|
||||||
# REQUIRED: The instance's cloud provider
|
# REQUIRED: The instance's cloud provider
|
||||||
# valid: aws, azure, gcp, oci, nocloud
|
# valid: aws, azure, gcp, oci, nocloud
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user