git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
path: root/bin/sxs
blob: 7e544ef1f33ec0942c842e8ca5f08d7768d371e2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
#!/bin/bash

pidof -s xinit && exit 0

[ -z "$STXTARG" ] && STXTARG="$1"

if [ -z "$STXTARG" ];then
	read -p "Start: e16, xmonad, gnome or kde? " STXTARG
	[ -z "$STXTARG" ] && STXTARG="xmonad"
fi

case "$STXTARG" in
	e16)
		diff ~/.xsession-e16 ~/.xsession &> /dev/null
		[ "$?" -ne 0 ] && ln -sf .xsession-e16 ~/.xsession
	;;
	xmonad)
		diff ~/.xsession-xmonad ~/.xsession &> /dev/null
		[ "$?" -ne 0 ] && ln -sf .xsession-xmonad ~/.xsession
	;;
	gnome)
		diff ~/.xsession-gnome ~/.xsession &> /dev/null
		[ "$?" -ne 0 ] && ln -sf .xsession-gnome ~/.xsession
	;;
	kde)
		diff ~/.xsession-kde ~/.xsession &> /dev/null
		[ "$?" -ne 0 ] && ln -sf .xsession-kde ~/.xsession
	;;
	*)
		echo "Sorry, I don't know $STXTARG as window manager."
		exit 1
	;;
esac

startx
mmitgraph'>| * | Disable max-requests-per-instance to mitigate hiera-eyaml mem leakNick Walker 2016-02-241-1/+1 | |/ | | | | | | | | | | | | | | | | Hiera-eyaml currently causes a memory leak in puppetsever when max-requests-per-instnace is enabled. So, defaulting to disabling max-requests-per-instance. https://tickets.puppetlabs.com/browse/SERVER-1154 https://github.com/TomPoulton/hiera-eyaml/issues/163 * | Merge pull request #21 from cvquesty/productionNick Walker 2016-02-241-1/+1 |\ \ | | | | | | Corrected documentation grammar. | * | Corrected documentation grammar.Jerald Sheets 2016-02-241-1/+1 |/ / * | Merge pull request #19 from pjmorr/patch-1Nate McCurdy 2016-02-221-1/+1 |\ \ | |/ |/| Update all_in_one_pe_2015_2.pp | * Update all_in_one_pe_2015_2.ppPhilip Morrison 2016-02-141-1/+1 |/ | | | Shouldn't this be profile::git_webhook as in all_in_one_pe.pp since the abstraction logic is located there? Either that or the profile::zack_r10k_webook is missing from the location specified? * Merge pull request #15 from npwalker/fix_hostname_in_role_curlNate McCurdy 2016-01-271-1/+1 |\ | | | | Fix hostname on role creation curl command | * Fix hostname on role creation curl commandNick Walker 2016-01-121-1/+1 |/ | | | | | | | | | | Prior to the this commit, if you were using the code_manager profile on a split install it would incorrectly try to curl the NC api on the master node. After this commit, it should correctly curl the hostname of the NC This has no impact on the functionality of the code on a monolithic PE installation. * Merge pull request #12 from npwalker/move_hiera_config_settingGary Larizza 2016-01-111-1/+10 |\ | | | | Move hiera_config to main section of puppet.conf | * Move hiera_config to main section of puppet.confNick Walker 2016-01-061-1/+10 |/ | | | | If it is in master instead of main then puppet apply will give a warning. * Merge pull request #9 from npwalker/2015_3_prepGary Larizza 2016-01-0518-148/+436 |\ | | | | Changes for PE2015.3.0 | * Update README with info on how to upgrade from 2015.2Nick Walker 2016-01-041-50/+52 | | | | | | | | | | | | | | Mostly reorganized the README to be 2015.3 first and then have some extra info at the bottom about upgrading from 2015.2. Added a blurb about what the control-repo provides. | * Add an exec to create the Deploy Environments RBAC RoleNick Walker 2015-12-282-9/+25 | | | | | | | | | | | | | | | | | | Prior to this commit there was a requirement for the user of this repo to create a RBAC role in order for code manager to work. After this commit an exec statement will curl the RBAC API to create the role one time and hopefully it works otherwise the exec will not run again. | * Add functionality to disable the zack/r10k webhookNick Walker 2015-12-212-0/+15 | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, if you upgraded from a previous version of the control-repo both code manager and zack/r10k webhook would be running and ready to receive data. This can present problems if the webhook isn't disbled in the git management system is sending data to both receivers. This commit adds rudimentary ability to break the zack/r10k webhook so it can't receive data. | * Create profile::git_webhook to abstract away the detailsNick Walker 2015-12-215-4/+15 | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit there were two possible webhooks - zack/r10k webhook - code manager I moved these two profiles under git_webhook and choose the correct one based on the version of PE being used. As a safety hatch, I provide the $force_zack_r10k_webhook param on profile::git_webhook in case someone needs to continue using it instead of code manager. | * Update config_version to read r10k_deploy.json fileNick Walker 2015-12-182-1/+13 | | | | | | | | | | | | Update config_version.sh to read the r10k_deploy.json file if it exists. If it does not exist it will fall back to the existing logic | * Move hiera.yaml to avoid file-sync overwriting itNick Walker 2015-12-181-1/+19 | | | | | | | | | | | | | | | | File sync appears to sync everything in the $codedir which inlcudes hiera.yaml. When managing hiera.yaml with puppet code you don't want file sync to overwrite its contents. So, I'm moving it out of $codedir and removing the original hiera.yaml to avoid confusion for users investigating later. | * Add instructions for testing code managerNick Walker 2015-12-181-1/+34 | | | | | | | | | | | | | | Also, add a table of contents to the README. I generated the table of contents using https://github.com/ekalinin/github-markdown-toc.go | * Disable file bucket to match default PE2015.3 behaviorNick Walker 2015-12-181-15/+4 | | | * Final steps to make Code Manager workNick Walker 2015-12-186-64/+111 | | | | | | | | | | | | | | | | | | | | - Moved ssh key generation and git deploy key out of the puppetmaster profile and into zack_r10k and code_manager - Swapped code manager into the all_in_one role - Made a 2015.2 all_in_one role if users prefer to use it - Conditionally move all existing code out of environmentpath to allow file sync to sync files - Update the README to compliment the new puppet code | * Chown files in codedir to pe-puppetNick Walker 2015-12-091-0/+6 | | | * Allow disabling authentication on code manager webhookNick Walker 2015-12-091-3/+12 | | | * Disable code manager webhook authenticationNick Walker 2015-12-091-0/+1 | | | * Allow code_manager profile to not error out on first runNick Walker 2015-12-092-4/+43 | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, the code manger profile could not complete on the first run because the file function would error out I implemented a new version of the file function that returns nothing when the file does not exist instead of erroring out which allows me to gate creating the webhook on whether there is content in the file. As a result this means that it takes 2 runs to get everything setup but this is preferable over having to manually intervene in some other way if the token file doesn't exist. | * Refactor puppetmaster and zack_r10k_webhookNick Walker 2015-12-093-30/+12 | | | | | | | | | | | | | | | | | | | | Moved the webhook resource out of puppetmaster and into zack_r10k to support exchaning code_manager in place of zack_r10k As a result I cleaned up some unnecessary parameters. Installing both the r10k webhook and the code_manager at this time for testing | * Add support for code manager which will replace zack r10k