Skip to content

Commit 1894580

Browse files
Merge branch 'main' into cat/claude-code-3-0-1
2 parents ab86bce + 898219b commit 1894580

File tree

4 files changed

+27
-21
lines changed

4 files changed

+27
-21
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
Closes #
2-
31
## Description
42

53
<!-- Briefly describe what this PR does and why -->
64

75
## Type of Change
86

97
- [ ] New module
8+
- [ ] New template
109
- [ ] Bug fix
1110
- [ ] Feature/enhancement
1211
- [ ] Documentation
@@ -20,10 +19,16 @@ Closes #
2019
**New version:** `v1.0.0`
2120
**Breaking change:** [ ] Yes [ ] No
2221

22+
## Template Information
23+
24+
<!-- Delete this section if not applicable -->
25+
26+
**Path:** `registry/[namespace]/templates/[template-name]`
27+
2328
## Testing & Validation
2429

2530
- [ ] Tests pass (`bun test`)
26-
- [ ] Code formatted (`bun run fmt`)
31+
- [ ] Code formatted (`bun fmt`)
2732
- [ ] Changes tested locally
2833

2934
## Related Issues

registry/coder/modules/kasmvnc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Automatically install [KasmVNC](https://kasmweb.com/kasmvnc) in a workspace, and
1414
module "kasmvnc" {
1515
count = data.coder_workspace.me.start_count
1616
source = "registry.coder.com/coder/kasmvnc/coder"
17-
version = "1.2.3"
17+
version = "1.2.4"
1818
agent_id = coder_agent.example.id
1919
desktop_environment = "xfce"
2020
subdomain = true

registry/coder/modules/kasmvnc/run.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ install_deb() {
6060
sudo apt-get -o DPkg::Lock::Timeout=300 -qq update
6161
fi
6262

63+
echo "Installing required Perl DateTime module..."
64+
DEBIAN_FRONTEND=noninteractive sudo apt-get -o DPkg::Lock::Timeout=300 install --yes -qq --no-install-recommends --no-install-suggests libdatetime-perl
65+
6366
DEBIAN_FRONTEND=noninteractive sudo apt-get -o DPkg::Lock::Timeout=300 install --yes -qq --no-install-recommends --no-install-suggests "$kasmdeb"
6467
rm "$kasmdeb"
6568
}
@@ -233,19 +236,17 @@ get_http_dir() {
233236

234237
# Check the system configuration path
235238
if [[ -e /etc/kasmvnc/kasmvnc.yaml ]]; then
236-
d=($(grep -E "^\s*httpd_directory:.*$" /etc/kasmvnc/kasmvnc.yaml))
237-
# If this grep is successful, it will return:
238-
# httpd_directory: /usr/share/kasmvnc/www
239-
if [[ $${#d[@]} -eq 2 && -d "$${d[1]}" ]]; then
240-
httpd_directory="$${d[1]}"
239+
d=$(grep -E '^\s*httpd_directory:.*$' "/etc/kasmvnc/kasmvnc.yaml" | awk '{print $$2}')
240+
if [[ -n "$d" && -d "$d" ]]; then
241+
httpd_directory=$d
241242
fi
242243
fi
243244

244245
# Check the home directory for overriding values
245246
if [[ -e "$HOME/.vnc/kasmvnc.yaml" ]]; then
246-
d=($(grep -E "^\s*httpd_directory:.*$" "$HOME/.vnc/kasmvnc.yaml"))
247-
if [[ $${#d[@]} -eq 2 && -d "$${d[1]}" ]]; then
248-
httpd_directory="$${d[1]}"
247+
d=$(grep -E '^\s*httpd_directory:.*$' "$HOME/.vnc/kasmvnc.yaml" | awk '{print $$2}')
248+
if [[ -n "$d" && -d "$d" ]]; then
249+
httpd_directory=$d
249250
fi
250251
fi
251252
echo $httpd_directory

registry/mavrickrishi/modules/nexus-repository/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
display_name: Nexus Repository
33
description: Configure package managers to use Sonatype Nexus Repository for Maven, npm, PyPI, and Docker registries.
44
icon: ../../../../.icons/nexus-repository.svg
5-
verified: true
5+
verified: false
66
tags: [integration, nexus-repository, maven, npm, pypi, docker]
77
---
88

@@ -13,7 +13,7 @@ Configure package managers (Maven, npm, Go, PyPI, Docker) to use [Sonatype Nexus
1313
```tf
1414
module "nexus_repository" {
1515
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
16-
version = "1.0.0"
16+
version = "1.0.1"
1717
agent_id = coder_agent.example.id
1818
nexus_url = "https://nexus.example.com"
1919
nexus_password = var.nexus_api_token
@@ -43,7 +43,7 @@ module "nexus_repository" {
4343
```tf
4444
module "nexus_repository" {
4545
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
46-
version = "1.0.0"
46+
version = "1.0.1"
4747
agent_id = coder_agent.example.id
4848
nexus_url = "https://nexus.example.com"
4949
nexus_password = var.nexus_api_token
@@ -58,7 +58,7 @@ module "nexus_repository" {
5858
```tf
5959
module "nexus_repository" {
6060
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
61-
version = "1.0.0"
61+
version = "1.0.1"
6262
agent_id = coder_agent.example.id
6363
nexus_url = "https://nexus.example.com"
6464
nexus_password = var.nexus_api_token
@@ -73,7 +73,7 @@ module "nexus_repository" {
7373
```tf
7474
module "nexus_repository" {
7575
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
76-
version = "1.0.0"
76+
version = "1.0.1"
7777
agent_id = coder_agent.example.id
7878
nexus_url = "https://nexus.example.com"
7979
nexus_password = var.nexus_api_token
@@ -88,7 +88,7 @@ module "nexus_repository" {
8888
```tf
8989
module "nexus_repository" {
9090
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
91-
version = "1.0.0"
91+
version = "1.0.1"
9292
agent_id = coder_agent.example.id
9393
nexus_url = "https://nexus.example.com"
9494
nexus_password = var.nexus_api_token
@@ -103,7 +103,7 @@ module "nexus_repository" {
103103
```tf
104104
module "nexus_repository" {
105105
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
106-
version = "1.0.0"
106+
version = "1.0.1"
107107
agent_id = coder_agent.example.id
108108
nexus_url = "https://nexus.example.com"
109109
nexus_password = var.nexus_api_token
@@ -118,7 +118,7 @@ module "nexus_repository" {
118118
```tf
119119
module "nexus_repository" {
120120
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
121-
version = "1.0.0"
121+
version = "1.0.1"
122122
agent_id = coder_agent.example.id
123123
nexus_url = "https://nexus.example.com"
124124
nexus_username = "custom-user"
@@ -134,7 +134,7 @@ module "nexus_repository" {
134134
```tf
135135
module "nexus_repository" {
136136
source = "registry.coder.com/mavrickrishi/nexus-repository/coder"
137-
version = "1.0.0"
137+
version = "1.0.1"
138138
agent_id = coder_agent.example.id
139139
nexus_url = "https://nexus.example.com"
140140
nexus_password = var.nexus_api_token

0 commit comments

Comments
 (0)