From 4f9f0733f0f7a40b835c7c42c53c5ba47ede961c Mon Sep 17 00:00:00 2001
From: Tyler Lynch <awstyler@amazon.com>
Date: Thu, 29 Aug 2024 16:58:26 -0400
Subject: [PATCH] Updated Gitea config

---
 Solutions/Gitea/Gitea-pkg.yaml |  2 +-
 Solutions/Gitea/Gitea.sh       | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Solutions/Gitea/Gitea-pkg.yaml b/Solutions/Gitea/Gitea-pkg.yaml
index 1e81bc19..4f9e7818 100644
--- a/Solutions/Gitea/Gitea-pkg.yaml
+++ b/Solutions/Gitea/Gitea-pkg.yaml
@@ -132,7 +132,7 @@ Resources:
         - Key: Name
           Value: gitea-server
       UserData: !Base64
-        Fn::Sub: "#!/bin/bash\n\nset -eou pipefail\n\nlocal_ip=$(ec2-metadata | grep \"^local-ipv4: \" | cut -d \" \" -f 2)\n\n# Get the password from secrets manager\nsecret_string=$(aws secretsmanager get-secret-value --secret-id ${SecretName} | jq -r \".SecretString\")\n\n# Install cfn-signal\nyum install -y aws-cfn-bootstrap\n\n# Install go\nyum install -y go\n\n# Install nodejs\nyum install -y nodejs\n\n# Clone the repo and build Gitea\nsudo -u ec2-user -i <<EOF\ncd /home/ec2-user\nmkdir /home/ec2-user/lib\ntouch /home/ec2-user/gitea.ini\ngit clone https://github.com/go-gitea/gitea\ncd gitea\ngit checkout v1.22.1\nTAGS=\"bindata sqlite sqlite_unlock_notify\" make build\nEOF\n\n\n# Install was failing because of this for some reason\n# This is the default and I think there is code that doesn't check to \n# see that we changed it.\nmkdir /home/git\nchown ec2-user /home/git\n\n# Configure systemd\ntee /etc/systemd/system/gitea.service <<EOF\n[Unit]\nDescription=Gitea (Git with a cup of tea)\nAfter=network.target\n[Service]\nRestartSec=2s\nType=simple\nUser=ec2-user\nGroup=ec2-user\nWorkingDirectory=/home/ec2-user/lib\nExecStart=/home/ec2-user/gitea/gitea web --port 8080 --config /home/ec2-user/gitea.ini\nRestart=always\nEnvironment=USER=ec2-user HOME=/home/git GITEA_WORK_DIR=/home/ec2-user/lib\n[Install]\nWantedBy=multi-user.target\nEOF\n\n# Configure gitea for headless install using the private IP\ntee /home/ec2-user/gitea.ini << EOF\n[server]\nHTTP_ADDR = $local_ip\n\n[security] \nINSTALL_LOCK = true\n\n[database]\nDB_TYPE = sqlite3\nEOF\n\nchown ec2-user /home/ec2-user/gitea.ini\n\nsystemctl daemon-reload\nsystemctl enable --now gitea\n\n# Wait for the server to start up\nsleep 30\n\n# Create the admin user\ncd /home/ec2-user/gitea\nsudo -u ec2-user ./gitea --config /home/ec2-user/gitea.ini admin user create --username admin1 --password $secret_string --email ezbeard@amazon.com --admin --must-change-password=false\n\n# Tell CloudFormation we're ready to go\n# This is a variable for the Sub intrisic function, not a bash variable\ncfn-signal -s true --stack ${AWS::StackName} --resource Server --region ${AWS::Region}"
+        Fn::Sub: "#!/bin/bash\n\nset -eou pipefail\n\nlocal_ip=$(ec2-metadata | grep \"^local-ipv4: \" | cut -d \" \" -f 2)\n\n# Get the password from secrets manager\nsecret_string=$(aws secretsmanager get-secret-value --secret-id ${SecretName} | jq -r \".SecretString\")\n\n# Install cfn-signal\nyum install -y aws-cfn-bootstrap\n\n# Install go\nyum install -y go\n\n# Install nodejs\nyum install -y nodejs\n\n# Clone the repo and build Gitea\nsudo -u ec2-user -i <<EOF\ncd /home/ec2-user\nmkdir /home/ec2-user/lib\ntouch /home/ec2-user/gitea.ini\n\ngit clone https://github.com/go-gitea/gitea\ncd gitea\ngit checkout v1.22.1\nTAGS=\"bindata sqlite sqlite_unlock_notify\" make build\nEOF\n\n\n# Install was failing because of this for some reason\n# This is the default and I think there is code that doesn't check to \n# see that we changed it.\nmkdir /home/git\nchown ec2-user /home/git\n\n# Configure systemd\ntee /etc/systemd/system/gitea.service <<EOF\n[Unit]\nDescription=Gitea (Git with a cup of tea)\nAfter=network.target\n[Service]\nRestartSec=2s\nType=simple\nUser=ec2-user\nGroup=ec2-user\nWorkingDirectory=/home/ec2-user/lib\nExecStart=/home/ec2-user/gitea/gitea web --port 8080 --config /home/ec2-user/gitea.ini\nRestart=always\nEnvironment=USER=ec2-user HOME=/home/git GITEA_WORK_DIR=/home/ec2-user/lib\n[Install]\nWantedBy=multi-user.target\nEOF\n\n# Configure gitea for headless install using the private IP\ntee /home/ec2-user/gitea.ini << EOF\n[database]\nDB_TYPE = sqlite3\n\n[security] \nINSTALL_LOCK = true\n\n[server]\nHTTP_ADDR = $local_ip\n\n[service]\nDISABLE_REGISTRATION = true\n\n[service.explore]\nREQUIRE_SIGNIN_VIEW = true\nDISABLE_USERS_PAGE = true\n\n[other]\nENABLE_SITEMAP = false\nENABLE_FEED = false\nEOF\n\nchown ec2-user /home/ec2-user/gitea.ini\n\nsystemctl daemon-reload\nsystemctl enable --now gitea\n\n# Wait for the server to start up\nsleep 30\n\n# Create the admin user\ncd /home/ec2-user/gitea\nsudo -u ec2-user ./gitea --config /home/ec2-user/gitea.ini admin user create --username admin1 --password $secret_string --email ezbeard@amazon.com --admin --must-change-password=false\n\n# Tell CloudFormation we're ready to go\n# This is a variable for the Sub intrisic function, not a bash variable\ncfn-signal -s true --stack ${AWS::StackName} --resource Server --region ${AWS::Region}"
 
   NetworkVPC:
     Type: AWS::EC2::VPC
diff --git a/Solutions/Gitea/Gitea.sh b/Solutions/Gitea/Gitea.sh
index 60e5d912..33b2ce6e 100644
--- a/Solutions/Gitea/Gitea.sh
+++ b/Solutions/Gitea/Gitea.sh
@@ -21,6 +21,7 @@ sudo -u ec2-user -i <<EOF
 cd /home/ec2-user
 mkdir /home/ec2-user/lib
 touch /home/ec2-user/gitea.ini
+
 git clone https://github.com/go-gitea/gitea
 cd gitea
 git checkout v1.22.1
@@ -54,14 +55,25 @@ EOF
 
 # Configure gitea for headless install using the private IP
 tee /home/ec2-user/gitea.ini << EOF
-[server]
-HTTP_ADDR = $local_ip
+[database]
+DB_TYPE = sqlite3
 
 [security] 
 INSTALL_LOCK = true
 
-[database]
-DB_TYPE = sqlite3
+[server]
+HTTP_ADDR = $local_ip
+
+[service]
+DISABLE_REGISTRATION = true
+
+[service.explore]
+REQUIRE_SIGNIN_VIEW = true
+DISABLE_USERS_PAGE = true
+
+[other]
+ENABLE_SITEMAP = false
+ENABLE_FEED = false
 EOF
 
 chown ec2-user /home/ec2-user/gitea.ini