diff --git a/etc/.gitignore b/etc/.gitignore
index 1ed8b7f..25e99a4 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -86,6 +86,7 @@
 /sysctl.conf
 /sysctl.d/
 /syslog.d/
+/terrastate-accounts
 /udev/
 /vmware-tools/
 /wgetrc
diff --git a/etc/default/terrastate b/etc/default/terrastate
new file mode 100644
index 0000000..eb93d9b
--- /dev/null
+++ b/etc/default/terrastate
@@ -0,0 +1,5 @@
+export TS_LOG_LEVEL=warn
+export TS_BIND=0.0.0.0:8080
+export TS_AUTH=file
+export TS_USER_FILE=/etc/terrastate-accounts
+# export TS_AUTH_PREFIX=
diff --git a/etc/group b/etc/group
index 1eec63f..77dc6c3 100644
--- a/etc/group
+++ b/etc/group
@@ -35,3 +35,4 @@ rpc:x:996:
 _mlocate:x:995:
 _apache:x:994:
 _gitea:x:993:
+_terrastate:x:992:
diff --git a/etc/gshadow.gpg b/etc/gshadow.gpg
index 9b47ed1..3f112f6 100644
--- a/etc/gshadow.gpg
+++ b/etc/gshadow.gpg
@@ -1,2 +1,3 @@
-�
	܇'T�4�����:
�`z��r`�bEH�8���;��T�j^�S*�<"=(�8�de7Y�ud*.� 5[���S�>r�u �G���SF��P5L�q����+f�
-�T��&������.ݡ�8-�d4+����'�q	1Hw��ޛD_���9�����a��x�Zlj1�
��D��n��'~��E^�n�SM��4q����Z��D�k�M�o��0fE��M<���]�<�G�@�R5�`6)K�sM�v�*�>�MZ���
\ No newline at end of file
+�
	b�c��$���>
B���0�
~J�:ߟ�X���\M���3V��-�34���U�%�8��=���Y������j*Y��g��ІW��O��I�q0Y'r�A<���*m�b�:�^H�
+�+<�e�ZU���Y߲�듪��k��Сv#Y3��^�r}�e�z�#�
+ES9,���v����J�s��Wǚ`�=�d��#��]os��]�.q�P�R�{���v��H��A^ð�vs�*�4�g�m��џ���=
\ No newline at end of file
diff --git a/etc/passwd b/etc/passwd
index b326911..f21e04b 100644
--- a/etc/passwd
+++ b/etc/passwd
@@ -8,3 +8,4 @@ rpc:x:996:996:rpc unprivileged user:/var/empty:/sbin/nologin
 _mlocate:x:995:995:_mlocate unprivileged user:/var/empty:/sbin/nologin
 _apache:x:994:994:_apache unprivileged user:/srv/www/apache:/sbin/nologin
 _gitea:x:993:993:_gitea unprivileged user:/var/lib/gitea:/bin/bash
+_terrastate:x:992:992:_terrastate unprivileged user:/var/lib/terrastate:/sbin/nologin
diff --git a/etc/shadow.gpg b/etc/shadow.gpg
index 32826bd..30ee36e 100644
Binary files a/etc/shadow.gpg and b/etc/shadow.gpg differ
diff --git a/etc/sv/terrastate/.gitignore b/etc/sv/terrastate/.gitignore
new file mode 100644
index 0000000..73309b9
--- /dev/null
+++ b/etc/sv/terrastate/.gitignore
@@ -0,0 +1,3 @@
+/log/
+/run
+/supervise
diff --git a/etc/sv/terrastate/conf b/etc/sv/terrastate/conf
new file mode 120000
index 0000000..f674d00
--- /dev/null
+++ b/etc/sv/terrastate/conf
@@ -0,0 +1 @@
+/etc/default/terrastate
\ No newline at end of file
diff --git a/etc/terrastate-accounts.gpg b/etc/terrastate-accounts.gpg
new file mode 100644
index 0000000..a011a4d
--- /dev/null
+++ b/etc/terrastate-accounts.gpg
@@ -0,0 +1,2 @@
+�
	�rA�w}���V
�j���ϫ��n�Ү�Cܴn�+�ϴK�|���%7$2���7!	X����+�lW{��"�CY쓜��Pe��i�G"�
+F,�8�
\ No newline at end of file
diff --git a/var/lib/.gitignore b/var/lib/.gitignore
index a73842b..8afa49a 100644
--- a/var/lib/.gitignore
+++ b/var/lib/.gitignore
@@ -6,3 +6,4 @@
 /nfs/
 /os-prober/
 /seedrng/
+/terrastate/