From 77113246b0865e82a79758567696f571561a302c Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 5 Sep 2020 16:56:27 +0100 Subject: [PATCH] Remove remaining gitea configuration Goodbye old friend --- .../intersect-docker/files/gitea/app.ini | 95 ------------------- .../files/gitea/docker-compose.yml | 42 -------- .../files/gitea/git-mirror-repositories.toml | 7 -- .../files/nextcloud/docker-compose.yml | 1 - .../roles/intersect-docker/tasks/gitea.yml | 44 --------- ansible/roles/intersect-docker/tasks/main.yml | 3 - ansible/roles/intersect-docker/vars/gitea.yml | 46 --------- terraform/theorangeone.net.tf | 8 -- 8 files changed, 246 deletions(-) delete mode 100644 ansible/roles/intersect-docker/files/gitea/app.ini delete mode 100644 ansible/roles/intersect-docker/files/gitea/docker-compose.yml delete mode 100644 ansible/roles/intersect-docker/files/gitea/git-mirror-repositories.toml delete mode 100644 ansible/roles/intersect-docker/tasks/gitea.yml delete mode 100644 ansible/roles/intersect-docker/vars/gitea.yml diff --git a/ansible/roles/intersect-docker/files/gitea/app.ini b/ansible/roles/intersect-docker/files/gitea/app.ini deleted file mode 100644 index 59f3d3a..0000000 --- a/ansible/roles/intersect-docker/files/gitea/app.ini +++ /dev/null @@ -1,95 +0,0 @@ -APP_NAME = Gitea -RUN_MODE = prod -RUN_USER = git - -[repository] -ROOT = /data/git/repositories - -[repository.local] -LOCAL_COPY_PATH = /data/gitea/tmp/local-repo - -[repository.upload] -TEMP_PATH = /data/gitea/uploads - -[server] -APP_DATA_PATH = /data/gitea -SSH_DOMAIN = gitea -HTTP_PORT = 3000 -ROOT_URL = https://git.theorangeone.net/ -DISABLE_SSH = false -SSH_PORT = 22 -SSH_LISTEN_PORT = 3022 -START_SSH_SERVER = true -LFS_START_SERVER = true -LFS_CONTENT_PATH = /data/git/lfs -DOMAIN = git.theorangeone.net -LFS_JWT_SECRET = {{ gitea.lfs_jwt_secret }} -OFFLINE_MODE = false -LANDING_PAGE = explore -ENABLE_GZIP = true - -[ui] -EXPLORE_PAGING_NUM = 1000 -DEFAULT_THEME = gitea -THEMES = gitea,arc-green - -[database] -DB_TYPE = postgres -HOST = db:5432 -NAME = gitea -USER = gitea -PASSWD = gitea -SSL_MODE = disable -CHARSET = utf8 -LOG_SQL = false - -[indexer] -ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve - -[session] -PROVIDER_CONFIG = /data/gitea/sessions -PROVIDER = file -COOKIE_NAME = session -COOKIE_SECURE = true - -[picture] -AVATAR_UPLOAD_PATH = /data/gitea/avatars -REPOSITORY_AVATAR_UPLOAD_PATH = /data/gitea/repo-avatars -DISABLE_GRAVATAR = false -ENABLE_FEDERATED_AVATAR = true - -[attachment] -PATH = /data/gitea/attachments - -[log] -LEVEL = info -ACCESS = console - -[security] -INSTALL_LOCK = true -SECRET_KEY = {{ gitea.secret_key }} -INTERNAL_TOKEN = {{ gitea.internal_token }} -COOKIE_USERNAME = gitea_username -COOKIE_REMEMBER_NAME = gitea_remember -LOGIN_REMEMBER_DAYS = 28 - -[service] -DISABLE_REGISTRATION = true -NO_REPLY_ADDRESS = noreply.example.org - -[oauth2] -JWT_SECRET = {{ gitea.jwt_secret }} - -[mailer] -ENABLED = false - -[openid] -ENABLE_OPENID_SIGNIN = false -ENABLE_OPENID_SIGNUP = false - -[cache] -ADAPTER = memory -INTERVAL = 60 - -[cron] -RUN_AT_START = true diff --git a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml b/ansible/roles/intersect-docker/files/gitea/docker-compose.yml deleted file mode 100644 index 0a1d54c..0000000 --- a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml +++ /dev/null @@ -1,42 +0,0 @@ -version: "2.3" - -services: - gitea: - image: gitea/gitea:1.12.3 - restart: unless-stopped - environment: - - USER_UID={{ docker_user.id }} - - USER_GID={{ docker_user.id }} - ports: - - "{{ wireguard.clients.intersect.ip }}:3022:3022" - depends_on: - - db - volumes: - - /mnt/tank/app-data/gitea:/data - - /mnt/tank/files/repositories:/data/git - - /etc/timezone:/etc/timezone:ro - - /etc/localtime:/etc/localtime:ro - - db: - image: postgres:12-alpine - restart: unless-stopped - volumes: - - /mnt/tank/dbs/postgres/gitea:/var/lib/postgresql/data - environment: - - POSTGRES_PASSWORD=gitea - - POSTGRES_USER=gitea - - db-backups: - image: prodrigestivill/postgres-backup-local:12-alpine - restart: unless-stopped - volumes: - - /scratch/db-backups:/backups - depends_on: - - db - environment: - - POSTGRES_HOST=db - - POSTGRES_PASSWORD=gitea - - POSTGRES_USER=gitea - - POSTGRES_DB=gitea - - BACKUP_KEEP_MONTHS=1 - - BACKUP_KEEP_WEEKS=1 diff --git a/ansible/roles/intersect-docker/files/gitea/git-mirror-repositories.toml b/ansible/roles/intersect-docker/files/gitea/git-mirror-repositories.toml deleted file mode 100644 index fc70a22..0000000 --- a/ansible/roles/intersect-docker/files/gitea/git-mirror-repositories.toml +++ /dev/null @@ -1,7 +0,0 @@ -[[repository]] -source = "https://git.theorangeone.net/r/infrastructure" -destination = "https://$GITHUB_TOKEN@github.com/RealOrangeOne/infrastructure" - -[[repository]] -source = "https://git.theorangeone.net/r/dotfiles" -destination = "https://$GITHUB_TOKEN@github.com/RealOrangeOne/dotfiles" diff --git a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml index 612edbe..4d16138 100644 --- a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml @@ -11,7 +11,6 @@ services: - ./apps:/config/www/nextcloud/apps - ./config.php:/config/www/nextcloud/config/config.php - /srv/nextcloud-data/data:/data - - /opt/gitea/repos:/repos:ro - /mnt/media:/content:ro restart: unless-stopped depends_on: diff --git a/ansible/roles/intersect-docker/tasks/gitea.yml b/ansible/roles/intersect-docker/tasks/gitea.yml deleted file mode 100644 index f16f25f..0000000 --- a/ansible/roles/intersect-docker/tasks/gitea.yml +++ /dev/null @@ -1,44 +0,0 @@ -- name: Include gitea variables - include_vars: gitea.yml - -- name: Create gitea directory - file: - path: /opt/gitea - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install gitea compose file - template: - src: files/gitea/docker-compose.yml - dest: /opt/gitea/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config - register: compose_file - become: true - -- name: Install gitea config file - template: - src: files/gitea/app.ini - dest: /mnt/tank/app-data/gitea/gitea/conf/app.ini - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - register: gitea_config_file - become: true - -- name: Install git-mirror config file - template: - src: files/gitea/git-mirror-repositories.toml - dest: /mnt/tank/app-data/git-mirror/repositories.toml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - register: git_mirror_config_file - become: true - -- name: restart gitea - shell: - chdir: /opt/gitea - cmd: "{{ docker_update_command }}" - when: compose_file.changed or gitea_config_file.changed or git_mirror_config_file.changed diff --git a/ansible/roles/intersect-docker/tasks/main.yml b/ansible/roles/intersect-docker/tasks/main.yml index 5cdf09b..3e00bad 100644 --- a/ansible/roles/intersect-docker/tasks/main.yml +++ b/ansible/roles/intersect-docker/tasks/main.yml @@ -1,9 +1,6 @@ - name: Install calibre include: calibre.yml -- name: Install gitea - include: gitea.yml - - name: Install gotify include: gotify.yml diff --git a/ansible/roles/intersect-docker/vars/gitea.yml b/ansible/roles/intersect-docker/vars/gitea.yml deleted file mode 100644 index b6c8653..0000000 --- a/ansible/roles/intersect-docker/vars/gitea.yml +++ /dev/null @@ -1,46 +0,0 @@ -gitea: - jwt_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 37303933656432653862343063386566363732663764363530336134356536353039386637326564 - 3830323764306333643061393339313236616435666365660a643637353339353737636565313338 - 62643435393639376531326464333539623931363866396230633361313031303763313637383734 - 6338613633626661660a653133623561373237346266346666376666653737613536633232313536 - 38623262653837353065386266633261363431333535666539636365396237616361393064323163 - 3938306666643861636138366563386439323761386335623962 - secret_key: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 38373166333035376233393336346366616334633864643365316131363931393266343532386130 - 3764653861303064613965313665313266393762636239370a366366626662373164383532353366 - 35393837646238646136663133356261633464653935393665616531323335636134336634373065 - 6666646263636532380a346264386638656538356265373066616463653036373766383861623731 - 30643762303436313736633962356630393330373862353561326534653736336566386635316230 - 30666361643065306237653131623439396530333161643637383861623433656165626435316633 - 32646263636232313135623134306139633163333839316463656236343966383463643064396463 - 61643436333135373865 - internal_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 63306138636431656236306432666164326565643132666633313434626338306633343263356238 - 6236333661303439653837633165366661653330643038620a356432343262396132643234656134 - 66623031666461633038653933356235626163306238343035373630343162353831393561323032 - 3132656639393665660a623034313035643861623865383562303562373862346139313761346636 - 36633863386537393230633864646162313338623363616162373433643333656233363733306564 - 35633737343836613034373866353062323466636430346266393066346466313166663634313162 - 36663761333065653764613762643230326163643138643266383936663735366263623637306266 - 34616435313863393530336565323231626466343033383139376333633032633466643732343537 - 63306235613130616339316664616630663332333866373032373935653437306232 - lfs_jwt_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 32333832306662373064626334633465346437656230303162313735626530646638643564383439 - 6261663332613938373161316563646639353166633339310a393936353735663430333733383962 - 31376636663065656435376637663438363039643234626335393238386162393232613934303537 - 6431663036333331350a303332366162333862616534346161316531323039643762316365333865 - 35383235633166353930363034373235646466336530646463616661336361393835643533343534 - 3235316165373239633832316438303266343639356161303439 - git_mirror_github_token: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 65633837346566306438626237396538333164356539346565303862636638623664396664303430 - 3665646436373136313364613962383939633831663735650a366432393836366534336163626162 - 36616334376666376134363561386331376134393065353039356532356466646636626634306136 - 3930396265363130310a383430383461633036623136663738323063656664346233613837653933 - 39326639623466326436323135616337386362323065306466313032616166386536323131363730 - 3034666333393933313535313037326565393262623732306465 diff --git a/terraform/theorangeone.net.tf b/terraform/theorangeone.net.tf index baec460..d10386d 100644 --- a/terraform/theorangeone.net.tf +++ b/terraform/theorangeone.net.tf @@ -165,14 +165,6 @@ resource "cloudflare_record" "theorangeonenet_plausible" { ttl = 1 } -resource "cloudflare_record" "theorangeonenet_gitlab" { - zone_id = cloudflare_zone.theorangeonenet.id - name = "gitlab" - value = vultr_server.casey.main_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "theorangeonenet_gitlab_pages" { zone_id = cloudflare_zone.theorangeonenet.id name = "pages"