Dafydd Jones dafyddj

Triangle Workflows

A triangle workflow involves an upstream project and a personal fork containing a development branch of the project. This configuration makes git pull merge changes from the upstream but git push send local commits to the personal fork. However those config settings only work on relatively recent versions of git; 1.7.9 doesn't support the required remote.pushdefault config setting so you will have to explicitly tell git push which remote to push to.

This gist does not attempt to explain exactly what these commands do, it's intended as a cheat-sheet/reminder.

To set up a project area

There are times notifications aren't wanted about either a changed repo file or a new file that needs to be added to the repo. However, adding the name of the file to .gitignore might not be a good option, either. For example, locally-generated files that other users aren't likely to generate (e.g., files created by an editor) or files of experimental test code might not be appropriate to appear in a .gitignore file.

In those cases, use one of these solutions:

If the file is a changed repo file

Use the command:

git update-index --assume-unchanged "$FILE"

Gmail and GitHub

How to filter emails from GitHub in Gmail and flag them with labels.

The labels in this document are just examples.

Pull Request

Filter	Label

How to Add rsync to Git Bash for Windows 10

Download the package: http://www2.futureware.at/~nickoe/msys2-mirror/msys/x86_64/rsync-3.1.2-2-x86_64.pkg.tar.xz

Extract it and move rsync.exe to %HOMEDRIVE%%HOMEPATH%\AppData\Local\Programs\Git\usr\bin.

Python installation guide

These are my notes, not a generic solution. They are not meant to work anywhere outside my machines. Update version numbers to whatever are the current ones while you do this.

Install `asdf` and its python plugin, then install Python

asdf lives in https://github.com/asdf-vm/asdf

Follow its installation instructions, which at the moment of writing were:

	#!/usr/bin/env python
	import salt.client
	import argparse
	import sys

	parser = argparse.ArgumentParser(description='Check if minions are online.')
	parser.add_argument('hostname', help='The name of the minion to be checked')

	args = parser.parse_args()

	#!/usr/bin/env python
	# Copyright © 2016 Dan Sheridan <[email protected]>
	# This work is free. You can redistribute it and/or modify it under the
	# terms of the Do What The Fuck You Want To Public License, Version 2,
	# as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.

	import salt.client
	import argparse
	import sys
	import fnmatch

	# /srv/salt/upgrade_the_app.sls
	# Example of a complex, multi-host Orchestration state that performs status checks as it goes.
	# Note, this is untested and is meant to serve as an example.
	# Run via: salt-run state.orch upgrade_the_app pillar='{nodes: [nodeA, nodeB], version: 123}'

	{% set nodes = salt.pillar.get('nodes', []) %}
	{% set all_grains = salt.saltutil.runner('cache.grains',
	tgt=','.join(nodes), tgt_type='list') %}

	{# Default version if not given at the CLI. #}

	# Write policies from Pillar data
	/etc/vault.d/policies.d:
	file.directory:
	- mode: 0700

	{% for name, policy in salt['pillar.get']('vault:policies').iteritems() %}
	/etc/vault.d/policies.d/{{ name }}.json:
	file.managed:
	- source: salt://shopstyle-vault/files/policy.json
	- mode: 0600

	:: Windows 10 Hardening Script
	:: This is based mostly on my own personal research and testing. My objective is to secure/harden Windows 10 as much as possible while not impacting usability at all. (Think being able to run on this computer's of family members so secure them but not increase the chances of them having to call you to troubleshoot something related to it later on). References for virtually all settings can be found at the bottom. Just before the references section, you will always find several security settings commented out as they could lead to compatibility issues in common consumer setups but they're worth considering.
	:: Obligatory 'views are my own'. :)
	:: Thank you @jaredhaight for the Win Firewall config recommendations!
	:: Thank you @ricardojba for the DLL Safe Order Search reg key!
	:: Thank you @jessicaknotts for the help on testing Exploit Guard configs and checking privacy settings!
	:: Best script I've found for Debloating Windows 10: https://github.com/Sycnex/Windows10Debloater
	: