summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/tozt.pp1
-rw-r--r--modules/certbot/files/reload-cert1
-rw-r--r--modules/teleterm/files/teleterm.service10
-rw-r--r--modules/teleterm/manifests/init.pp35
-rw-r--r--modules/tozt/manifests/teleterm.pp31
-rw-r--r--modules/tozt/templates/teleterm.toml10
6 files changed, 0 insertions, 88 deletions
diff --git a/manifests/tozt.pp b/manifests/tozt.pp
index a213e35..9f7db97 100644
--- a/manifests/tozt.pp
+++ b/manifests/tozt.pp
@@ -21,7 +21,6 @@ node 'tozt', 'tozt.localdomain' {
include tozt::paste
include tozt::services
include tozt::site
- include tozt::teleterm
include tozt::tick
include tozt::ttrss
}
diff --git a/modules/certbot/files/reload-cert b/modules/certbot/files/reload-cert
index 226e261..9ca23e5 100644
--- a/modules/certbot/files/reload-cert
+++ b/modules/certbot/files/reload-cert
@@ -3,4 +3,3 @@ set -eu
set -o pipefail
systemctl restart nginx
-systemctl restart teleterm
diff --git a/modules/teleterm/files/teleterm.service b/modules/teleterm/files/teleterm.service
deleted file mode 100644
index dad7c42..0000000
--- a/modules/teleterm/files/teleterm.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description = runs teleterm
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/env -u HOME /usr/bin/tt server
-Restart=always
-
-[Install]
-WantedBy=default.target
diff --git a/modules/teleterm/manifests/init.pp b/modules/teleterm/manifests/init.pp
deleted file mode 100644
index 79303ee..0000000
--- a/modules/teleterm/manifests/init.pp
+++ /dev/null
@@ -1,35 +0,0 @@
-class teleterm($source) {
- include systemd
-
- group { "teleterm":
- ensure => present;
- }
- user { "teleterm":
- ensure => present,
- gid => "teleterm",
- system => true,
- home => "/",
- require => Group["teleterm"];
- }
-
- package { "teleterm":
- ensure => installed,
- source => $source,
- notify => Service["teleterm"];
- }
-
- systemd::service { "teleterm":
- source => "puppet:///modules/teleterm/teleterm.service",
- }
-
- service { "teleterm":
- ensure => "running",
- enable => true,
- require => [
- Systemd::Service["teleterm"],
- Exec["/usr/bin/systemctl daemon-reload"],
- User["teleterm"],
- Group["teleterm"],
- ];
- }
-}
diff --git a/modules/tozt/manifests/teleterm.pp b/modules/tozt/manifests/teleterm.pp
deleted file mode 100644
index 616d426..0000000
--- a/modules/tozt/manifests/teleterm.pp
+++ /dev/null
@@ -1,31 +0,0 @@
-class tozt::teleterm {
- include tozt::persistent
-
- $version = "0.2.0"
- $client_id = secret::value('teleterm_client_id')
- $client_secret = secret::value('teleterm_client_secret')
-
- class { 'teleterm':
- source => "/media/persistent/releases/doy/teleterm/arch/teleterm-${version}-1-x86_64.pkg.tar.xz",
- require => File['/media/persistent/releases'];
- }
-
- file {
- "/etc/teleterm":
- ensure => directory;
- "/etc/teleterm/config.toml":
- content => template("tozt/teleterm.toml"),
- require => File["/etc/teleterm"],
- notify => Service["teleterm"];
- "/var/lib/teleterm":
- ensure => directory,
- owner => "teleterm",
- group => "teleterm",
- mode => "0700",
- require => [
- User["teleterm"],
- Group["teleterm"],
- ],
- before => Service["teleterm"];
- }
-}
diff --git a/modules/tozt/templates/teleterm.toml b/modules/tozt/templates/teleterm.toml
deleted file mode 100644
index f651e52..0000000
--- a/modules/tozt/templates/teleterm.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[server]
-listen_address = "0.0.0.0:4144"
-allowed_login_methods = ["recurse_center"]
-tls_identity_file = "/media/persistent/certbot/live/tozt.net/identity.pfx"
-uid = "teleterm"
-gid = "teleterm"
-
-[oauth.recurse_center]
-client_id = "<%= @client_id %>"
-client_secret = "<%= @client_secret %>"