Compare commits
	
		
			3 Commits
		
	
	
		
			d6fad43f9c
			...
			483ea954b2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 483ea954b2 | |||
| 8fa1f674f9 | |||
| 2006b9733e | 
							
								
								
									
										36
									
								
								.drone.yml
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								.drone.yml
									
									
									
									
									
								
							| @ -1,36 +0,0 @@ | |||||||
| --- |  | ||||||
| kind: pipeline |  | ||||||
| type: docker |  | ||||||
| name: Static Verification |  | ||||||
| steps: |  | ||||||
|   - name: ansible-lint |  | ||||||
|     image: python:3.10.6 |  | ||||||
|     commands: |  | ||||||
|       # Make sure to update the ansible version below as well |  | ||||||
|       - pip --disable-pip-version-check install ansible==7.2.0 ansible-lint==6.16.1 > /dev/null 2> /dev/null |  | ||||||
|       - ansible-lint -c .ansible-lint ansible |  | ||||||
| 
 |  | ||||||
| --- |  | ||||||
| kind: pipeline |  | ||||||
| type: docker |  | ||||||
| name: Check |  | ||||||
| steps: |  | ||||||
|   - name: ansible-playbook --check |  | ||||||
|     image: python:3.10.6 |  | ||||||
|     environment: |  | ||||||
|       SSH_KEY: |  | ||||||
|         from_secret: ssh_key |  | ||||||
|       VAULT_PASSWORD: |  | ||||||
|         from_secret: vault_password |  | ||||||
|     commands: |  | ||||||
|       - pip install ansible==7.2.0 > /dev/null 2> /dev/null |  | ||||||
| 
 |  | ||||||
|       - mkdir "$HOME/.ssh" |  | ||||||
|       - echo "$SSH_KEY" > "$HOME/.ssh/id" |  | ||||||
|       - chmod 0600 ~/.ssh/id |  | ||||||
|       - ssh-keyscan -p 2309 vmd98928.contaboserver.net > "$HOME/.ssh/known_hosts" |  | ||||||
| 
 |  | ||||||
|       - echo "$VAULT_PASSWORD" > "$HOME/vault_password" |  | ||||||
| 
 |  | ||||||
|       - cd ansible |  | ||||||
|       - ansible-playbook --private-key "$HOME/.ssh/id" --vault-password-file "$HOME/vault_password" --check playbooks/misc-all.yaml |  | ||||||
							
								
								
									
										15
									
								
								.gitea/workflows/check.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								.gitea/workflows/check.yaml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,15 @@ | |||||||
|  | name: Check | ||||||
|  | on: [push] | ||||||
|  | jobs: | ||||||
|  |   "Lint Ansible Files": | ||||||
|  |     runs-on: ubuntu-22.04 | ||||||
|  |     steps: | ||||||
|  |       - run: apt-get update | ||||||
|  |       - run: apt-get install -y python3 python3-pip python3-venv | ||||||
|  |       - run: python3 --version | ||||||
|  |       - name: Check out repo | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |       - run: python3 -m venv venv | ||||||
|  |       - run: venv/bin/pip --disable-pip-version-check install ansible==7.2.0 ansible-lint==6.16.1 > /dev/null 2> /dev/null | ||||||
|  |       - run: venv/bin/ansible-lint -c .ansible-lint ansible | ||||||
|  |   # TODO: Reimplement ansible-play --check step from old drone config | ||||||
							
								
								
									
										2
									
								
								TODO.md
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								TODO.md
									
									
									
									
									
								
							| @ -14,3 +14,5 @@ | |||||||
| - [x] Make Gitea display graphs in Notebooks (see https://docs.gitea.io/en-us/external-renderers/). | - [x] Make Gitea display graphs in Notebooks (see https://docs.gitea.io/en-us/external-renderers/). | ||||||
| - [x] Factorio server | - [x] Factorio server | ||||||
| - [ ] Add flag for Gitea backups (after which Gitea will be up but no contain the sites source code) | - [ ] Add flag for Gitea backups (after which Gitea will be up but no contain the sites source code) | ||||||
|  | - [x] Add Gitea actions | ||||||
|  | - [ ] Remove drone | ||||||
|  | |||||||
| @ -71,7 +71,7 @@ services: | |||||||
|     restart: unless-stopped |     restart: unless-stopped | ||||||
|     environment: |     environment: | ||||||
|       CONFIG_FILE: /opt/runner-config.yaml |       CONFIG_FILE: /opt/runner-config.yaml | ||||||
|       GITEA_INSTANCE_URL: "http://gitea:3000" |       GITEA_INSTANCE_URL: "https://git.pbrinkmeier.de" | ||||||
|       GITEA_RUNNER_REGISTRATION_TOKEN: "${GITEA_RUNNER_REGISTRATION_TOKEN}" |       GITEA_RUNNER_REGISTRATION_TOKEN: "${GITEA_RUNNER_REGISTRATION_TOKEN}" | ||||||
|       GITEA_RUNNER_NAME: "basic-bitchboy" |       GITEA_RUNNER_NAME: "basic-bitchboy" | ||||||
|     volumes: |     volumes: | ||||||
|  | |||||||
| @ -28,6 +28,8 @@ runner: | |||||||
|   # Like: ["macos-arm64:host", "ubuntu-latest:docker://node:16-bullseye", "ubuntu-22.04:docker://node:16-bullseye"] |   # Like: ["macos-arm64:host", "ubuntu-latest:docker://node:16-bullseye", "ubuntu-22.04:docker://node:16-bullseye"] | ||||||
|   # If it's empty when registering, it will ask for inputting labels. |   # If it's empty when registering, it will ask for inputting labels. | ||||||
|   # If it's empty when execute `deamon`, will use labels in `.runner` file. |   # If it's empty when execute `deamon`, will use labels in `.runner` file. | ||||||
|  |   # Some (most?) GitHub actions use node for scripting, so just using | ||||||
|  |   # ubuntu:22.04 here is not enough. | ||||||
|   labels: |   labels: | ||||||
|     - "ubuntu-22.04:docker://node:16-bullseye" |     - "ubuntu-22.04:docker://node:16-bullseye" | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,14 +1,14 @@ | |||||||
| $ANSIBLE_VAULT;1.1;AES256 | $ANSIBLE_VAULT;1.1;AES256 | ||||||
| 39336432643438646536386533653365653639396331653263366665643635653630306632313364 | 35623364633833623964623536646534373634663736613561333561343136333965306638396532 | ||||||
| 6237616333336138336562383232323434613935396437390a623462386535363162333735626466 | 6162393239383936386338666565306132646230383066630a336337613636383431623738343663 | ||||||
| 34643232353537393931326661613665616265663866373662353364336533333862396564636133 | 61343262363631376665383035323139313863626331666439336134613035663439376231343863 | ||||||
| 6265343031366661650a306335616563653065613061623264383565643031303262636162663135 | 3032353139643138640a383365356630323835383538393734643134343133653033383663333464 | ||||||
| 34616334336661613964373938666130363864613665356466313230646362633032333237346132 | 62386361633435633664306531623835353665326432393932336163316561653866343137323030 | ||||||
| 34376265613866303565623461346136383638336364316639616535383432623938653464633538 | 63643262323436356166373533363235366238393633336631336266373837373932313134303563 | ||||||
| 61366538636466363465353734653361396434626166643231383762313862653238393566643938 | 65633337393938623134636538653561356565333831356638373862376333336163363438626438 | ||||||
| 65373063333934346239306534363135636237356637326638626536663934666239636138323235 | 39343436383732313561396236656530303064363961663636353538346264633532633866333162 | ||||||
| 39613137653838333965613634373638346165333137626539653861323466313463353264363465 | 35303032303662646166333537373566316462633536333463323433353539623363323036643763 | ||||||
| 35313739323833656539626333626432343733626639643064323237653032303165653963666138 | 34376365613932303133366236613235636238643139666663356436326532616437383432303437 | ||||||
| 37633138616562623863333965613039613636643331626132386231386433363965666166336239 | 39376535656266383465373837643634383937656431323265386163373138336164383666383962 | ||||||
| 37666565616366343062643838333434353266623362343636393365653461343366386133326232 | 64623762613332363731323739666238613634646237396331666463363663313461313966356233 | ||||||
| 33373361396134343133303963363764323761633061376461383830633332353637 | 30653362353061333739303234336461373337346632646433623462623765353330 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user