summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@fretlink.com>2019-08-21 09:49:01 +0200
committerIsmaël Bouya <ismael.bouya@fretlink.com>2019-08-21 09:49:01 +0200
commit80ed46d46999eff6a89f26622d4dd4900e3b2ce6 (patch)
tree1544cbfb9fcf5ce77bbfbc67a04ca507518e6fe3 /roles
parente7270a0e65cbbf398d999db98278114d809244dc (diff)
downloadAnsible-80ed46d46999eff6a89f26622d4dd4900e3b2ce6.tar.gz
Ansible-80ed46d46999eff6a89f26622d4dd4900e3b2ce6.tar.zst
Ansible-80ed46d46999eff6a89f26622d4dd4900e3b2ce6.zip
New configuration as of 2019-08-21
Diffstat (limited to 'roles')
-rwxr-xr-xroles/contexts/fretlink/files/workdir/start14
-rw-r--r--roles/contexts/fretlink/templates/environment.j260
-rw-r--r--roles/lxde/files/config_files/lxterminal/lxterminal.conf34
-rw-r--r--roles/lxde/files/config_files/openbox/lxde-rc.xml6
-rw-r--r--roles/lxde/files/config_files/pcmanfm/LXDE/pcmanfm.conf4
-rw-r--r--roles/shell/bash/templates/bashrc.j24
-rw-r--r--roles/tools/files/vimrc7
-rw-r--r--roles/tools/templates/ssh_config.j25
8 files changed, 110 insertions, 24 deletions
diff --git a/roles/contexts/fretlink/files/workdir/start b/roles/contexts/fretlink/files/workdir/start
index 840943a..8f440bf 100755
--- a/roles/contexts/fretlink/files/workdir/start
+++ b/roles/contexts/fretlink/files/workdir/start
@@ -1,6 +1,7 @@
1#!/bin/bash 1#!/bin/bash
2 2
3APP="$1" 3APP="$1"
4shift
4 5
5if [ -z "$APP" ]; then 6if [ -z "$APP" ]; then
6 if [ $(dirname $(pwd)) = "$HOME/workdir" ]; then 7 if [ $(dirname $(pwd)) = "$HOME/workdir" ]; then
@@ -11,9 +12,12 @@ if [ -z "$APP" ]; then
11 fi 12 fi
12fi 13fi
13 14
14if [ "$APP" != "psql" ]; then 15if [ "$APP" != "psql" -a "$APP" != "pg_restore" ]; then
15 cd $HOME/workdir/$APP 16 cd $HOME/workdir/$APP
16 source ../environment 17 source ../environment
18elif [ "$APP" = "pg_restore" ]; then
19 source ../environment
20 APP=pg_restore
17else 21else
18 source ../environment 22 source ../environment
19 APP=psql 23 APP=psql
@@ -41,14 +45,22 @@ function start_psql() {
41 psql -h $POSTGRESQL_ADDON_HOST -p $POSTGRESQL_ADDON_PORT -U $POSTGRESQL_ADDON_USER -d $POSTGRESQL_ADDON_DB 45 psql -h $POSTGRESQL_ADDON_HOST -p $POSTGRESQL_ADDON_PORT -U $POSTGRESQL_ADDON_USER -d $POSTGRESQL_ADDON_DB
42} 46}
43 47
48function start_pg_restore() {
49 export PGPASSWORD=$POSTGRESQL_ADDON_PASSWORD
50 pg_restore -h $POSTGRESQL_ADDON_HOST -p $POSTGRESQL_ADDON_PORT -U $POSTGRESQL_ADDON_USER -d $POSTGRESQL_ADDON_DB
51}
52
44case "$APP${FLAVOR:+-}$FLAVOR" in 53case "$APP${FLAVOR:+-}$FLAVOR" in
45 "psql") start_psql;; 54 "psql") start_psql;;
55 "pg_restore") start_pg_restore;;
46 "app") start_app;; 56 "app") start_app;;
47 "admin-root") start_stack server;; 57 "admin-root") start_stack server;;
58 "admin-user") start_stack server;;
48 "carrier-directory") start_stack server;; 59 "carrier-directory") start_stack server;;
49 "freight") start_stack freight-server;; 60 "freight") start_stack freight-server;;
50 "notifier") start_stack notifier-exe;; 61 "notifier") start_stack notifier-exe;;
51 "notifier-amqp") start_stack notifier-exe-amqp;; 62 "notifier-amqp") start_stack notifier-exe-amqp;;
52 "pricer") start_stack pricer;; 63 "pricer") start_stack pricer;;
64 "third-parties") start_stack server;;
53 "toolbox") start_stack toolbox-api;; 65 "toolbox") start_stack toolbox-api;;
54esac 66esac
diff --git a/roles/contexts/fretlink/templates/environment.j2 b/roles/contexts/fretlink/templates/environment.j2
index 652fc8d..85d3dc7 100644
--- a/roles/contexts/fretlink/templates/environment.j2
+++ b/roles/contexts/fretlink/templates/environment.j2
@@ -50,6 +50,11 @@ APP=$(basename $(pwd))
50FL_APPS_HOST="localhost" 50FL_APPS_HOST="localhost"
51FL_APPS_SCHEME="http" 51FL_APPS_SCHEME="http"
52 52
53FL_ADMIN_USER_PORT=8078
54FL_ADMIN_USER_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/AdminUser subkey=Secret') }}"
55FL_ADMIN_USER_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/AdminUser subkey=PrivateKey') }}"
56FL_ADMIN_USER_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_ADMIN_ROOT_PORT/api/"
57
53FL_ADMIN_ROOT_PORT=8079 58FL_ADMIN_ROOT_PORT=8079
54FL_ADMIN_ROOT_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/AdminRoot subkey=PrivateKey') }}" 59FL_ADMIN_ROOT_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/AdminRoot subkey=PrivateKey') }}"
55FL_ADMIN_ROOT_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_ADMIN_ROOT_PORT/api/" 60FL_ADMIN_ROOT_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_ADMIN_ROOT_PORT/api/"
@@ -69,12 +74,18 @@ FL_NOTIFIER_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Notif
69FL_NOTIFIER_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Notifier subkey=PrivateKey') }}" 74FL_NOTIFIER_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Notifier subkey=PrivateKey') }}"
70FL_NOTIFIER_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_NOTIFIER_PORT/api" 75FL_NOTIFIER_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_NOTIFIER_PORT/api"
71 76
77FL_THIRD_PARTIES_PORT=8086
78FL_THIRD_PARTIES_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/ThirdParties subkey=Secret') }}"
79
72FL_PRICER_PORT=8083 80FL_PRICER_PORT=8083
73FL_PRICER_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Pricer subkey=PrivateKey') }}" 81FL_PRICER_PRIVATE_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Pricer subkey=PrivateKey') }}"
82FL_PRICER_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Pricer subkey=Secret') }}"
74 83
75FL_FREIGHT_PORT=8084 84FL_FREIGHT_PORT=8084
76FL_FREIGHT_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Freight subkey=Secret') }}" 85FL_FREIGHT_SECRET="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/Freight subkey=Secret') }}"
77 86
87FL_HOMEPAGE_PORT=8085
88
78FL_BOOKKEEPING_SECRET="dummy" 89FL_BOOKKEEPING_SECRET="dummy"
79FL_LANE_EXPLORER_SECRET="dummy" 90FL_LANE_EXPLORER_SECRET="dummy"
80 91
@@ -112,6 +123,7 @@ if [ "$APP" != "app" ]; then
112 export POSTGRESQL_ADDON_USER="$FL_PSQL_USER" 123 export POSTGRESQL_ADDON_USER="$FL_PSQL_USER"
113 export POSTGRESQL_ADDON_PASSWORD="$FL_PSQL_PASSWORD" 124 export POSTGRESQL_ADDON_PASSWORD="$FL_PSQL_PASSWORD"
114 export POSTGRESQL_ADDON_DB="$name" 125 export POSTGRESQL_ADDON_DB="$name"
126 export PG_URI="postgresql://$POSTGRESQL_ADDON_USER:$POSTGRESQL_ADDON_PASSWORD@localhost:$POSTGRESQL_ADDON_PORT/$POSTGRESQL_ADDON_DB"
115 else 127 else
116 key=Psql/$(capitalize $FL_ENV)/$(capitalize $APP) 128 key=Psql/$(capitalize $FL_ENV)/$(capitalize $APP)
117 export POSTGRESQL_ADDON_HOST=$(p $key Host) 129 export POSTGRESQL_ADDON_HOST=$(p $key Host)
@@ -119,7 +131,15 @@ if [ "$APP" != "app" ]; then
119 export POSTGRESQL_ADDON_USER=$(p $key User) 131 export POSTGRESQL_ADDON_USER=$(p $key User)
120 export POSTGRESQL_ADDON_PASSWORD=$(p $key) 132 export POSTGRESQL_ADDON_PASSWORD=$(p $key)
121 export POSTGRESQL_ADDON_DB=$(p $key Database) 133 export POSTGRESQL_ADDON_DB=$(p $key Database)
134 export PG_URI="postgresql://$POSTGRESQL_ADDON_USER:$POSTGRESQL_ADDON_PASSWORD@$POSTGRESQL_ADDON_HOST:$POSTGRESQL_ADDON_PORT/$POSTGRESQL_ADDON_DB"
122 fi 135 fi
136
137 export GRAYLOG_HOST="localhost"
138 export GRAYLOG_PORT="1111"
139 export ENVIRONMENT_NAME="local"
140 export APPLICATION_NAME="$APP"
141 export SENTRY_DSN="test"
142 export ACCEPTED_ORIGINS="*"
123fi 143fi
124 144
125if [ "$APP" = "app" ]; then 145if [ "$APP" = "app" ]; then
@@ -140,6 +160,7 @@ if [ "$APP" = "app" ]; then
140 # carrier directory 160 # carrier directory
141 export CARRIER_DIRECTORY_URI="$FL_CARRIER_DIRECTORY_URL/" 161 export CARRIER_DIRECTORY_URI="$FL_CARRIER_DIRECTORY_URL/"
142 export FRETLINK_CARDIR_URL="$FL_CARRIER_DIRECTORY_URL" 162 export FRETLINK_CARDIR_URL="$FL_CARRIER_DIRECTORY_URL"
163 export FRETLINK_CARDIR_URL_FRONTEND="$FL_CARRIER_DIRECTORY_URL"
143 export FRETLINK_CARDIR_ENABLED="true" 164 export FRETLINK_CARDIR_ENABLED="true"
144 export FRETLINK_CARDIRV3_ACCESS_KEY="$(build_macaroon $FL_CARRIER_DIRECTORY_SECRET carrier-directory carrier-directory carrier-directory::read)" 165 export FRETLINK_CARDIRV3_ACCESS_KEY="$(build_macaroon $FL_CARRIER_DIRECTORY_SECRET carrier-directory carrier-directory carrier-directory::read)"
145 166
@@ -160,6 +181,13 @@ if [ "$APP" = "app" ]; then
160 export FRETLINK_NOTIFIER_AMQP_PORT="{{ lookup('passwordstore', 'Travail/Fretlink/Rabbitmq/Local/Notifier subkey=Port') }}" 181 export FRETLINK_NOTIFIER_AMQP_PORT="{{ lookup('passwordstore', 'Travail/Fretlink/Rabbitmq/Local/Notifier subkey=Port') }}"
161 export FRETLINK_NOTIFIER_AMQP_VHOST="{{ lookup('passwordstore', 'Travail/Fretlink/Rabbitmq/Local/Notifier subkey=Vhost') }}" 182 export FRETLINK_NOTIFIER_AMQP_VHOST="{{ lookup('passwordstore', 'Travail/Fretlink/Rabbitmq/Local/Notifier subkey=Vhost') }}"
162 183
184 # pricer
185 export FRETLINK_PRICER_USE_CARGO_OUTPUT="true"
186 export FRETLINK_PRICER_SHIPPER_PRICE_V2_KEY=$(build_macaroon $FL_PRICER_SECRET pricer pricer pricing::cargo)
187 export FRETLINK_PRICER_SHIPPER_PRICE_KEY=$(build_macaroon --old $FL_PRICER_SECRET pricer pricer internal-cargo-pricing)
188 export FRETLINK_PRICER_CARRIER_SUGGESTION_KEY=$(build_macaroon --old $FL_PRICER_SECRET pricer pricer internal-cargo-pricing)
189 export FRETLINK_PRICER_MACAROON="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/PricerDev') }}"
190 export FRETLINK_PRICER_URL="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/PricerDev subkey=Url') }}"
163 191
164 # admin-root 192 # admin-root
165 export FRETLINK_ADMINROOT_URL=$FL_ADMIN_ROOT_URL 193 export FRETLINK_ADMINROOT_URL=$FL_ADMIN_ROOT_URL
@@ -183,6 +211,24 @@ if [ "$APP" = "admin-root" ]; then
183 export LANE_EXPLORER_MACAROON_SECRET=$FL_LANE_EXPLORER_SECRET 211 export LANE_EXPLORER_MACAROON_SECRET=$FL_LANE_EXPLORER_SECRET
184fi 212fi
185 213
214if [ "$APP" = "admin-user" ]; then
215 export BASE_URL=$FL_APPS_HOST
216 export API_ROOT="http://$BASE_URL:$PORT/api"
217 export UI_ROOT="http://$BASE_URL:$PORT/admin"
218 export ACCEPTED_ORIGINS="http://$BASE_URL:$PORT/admin"
219 export TOK="$(build_macaroon $FL_ADMIN_USER_PRIVATE_KEY admin-user admin-user admin-user::provisioning)"
220 export ADMIN_TOKEN="$(build_macaroon $FL_ADMIN_USER_SECRET admin-user admin-user admin-user::user-management)"
221 export SERVICE_TOKEN="$(build_macaroon $FL_ADMIN_USER_SECRET admin-user admin-user admin-user::some-service)"
222fi
223
224if [ "$APP" = "homepage" ]; then
225 export HOMEPAGE_API_KEY="{{ lookup('passwordstore', 'Travail/Fretlink/Macaroons/HomepageDev subkey=ApiKey') }}"
226 export HOMEPAGE_API_ROOT_REDIRECT="https://next.www.fretlink.com"
227 export HOMEPAGE_API_BLOG_URL="https://blog.fretlink.com"
228 export HOMEPAGE_API_CIO_API_KEY="123"
229 export HOMEPAGE_API_CIO_SITE_ID="321"
230 fi
231
186if [ "$APP" = "carrier-directory" ]; then 232if [ "$APP" = "carrier-directory" ]; then
187 export ADMIN_BASE_URL=$FL_APP_URL 233 export ADMIN_BASE_URL=$FL_APP_URL
188 export ACCESS_KEY="$(build_macaroon $FL_CARRIER_DIRECTORY_SECRET carrier-directory carrier-directory carrier-directory::read)" 234 export ACCESS_KEY="$(build_macaroon $FL_CARRIER_DIRECTORY_SECRET carrier-directory carrier-directory carrier-directory::read)"
@@ -194,7 +240,7 @@ if [ "$APP" = "notifier" ]; then
194 export TEMPLATES_ASSETS_BASE_URL="http://dummy/" 240 export TEMPLATES_ASSETS_BASE_URL="http://dummy/"
195 export TRANSPOREON_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest subkey=Login') }}" 241 export TRANSPOREON_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest subkey=Login') }}"
196 export TRANSPOREON_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest') }}" 242 export TRANSPOREON_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest') }}"
197 export TRANSPOREON_HOST="api.test.transporeon.com" 243 export TRANSPOREON_HOST="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/ApiTest subkey=Host') }}"
198 export TRANSPOREON_CALLBACK_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest subkey=Login') }}" 244 export TRANSPOREON_CALLBACK_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest subkey=Login') }}"
199 export TRANSPOREON_CALLBACK_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest') }}" 245 export TRANSPOREON_CALLBACK_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest') }}"
200 246
@@ -203,6 +249,7 @@ if [ "$APP" = "notifier" ]; then
203 #export MACAROON="$(build_macaroon $FL_NOTIFIER_SECRET notifier notifier external)" 249 #export MACAROON="$(build_macaroon $FL_NOTIFIER_SECRET notifier notifier external)"
204 # v1 250 # v1
205 export MACAROON="$(build_macaroon --old $FL_NOTIFIER_PRIVATE_KEY notifier notifier external)" 251 export MACAROON="$(build_macaroon --old $FL_NOTIFIER_PRIVATE_KEY notifier notifier external)"
252 export MONITORING_MACAROON="$(build_macaroon --old $FL_NOTIFIER_PRIVATE_KEY notifier notifier monitoring)"
206 253
207 # To push transporeon cargos to app 254 # To push transporeon cargos to app
208 export TRANSPOREON_APP_PUSH_URL="http://localhost:8080/api/transporeon/cargo" 255 export TRANSPOREON_APP_PUSH_URL="http://localhost:8080/api/transporeon/cargo"
@@ -217,6 +264,17 @@ if [ "$APP" = "notifier" ]; then
217 export AMQP_TLS="false" 264 export AMQP_TLS="false"
218fi 265fi
219 266
267if [ "$APP" = "third-parties" ]; then
268 export PROCTER_GAMBLE_APP_PUSH_MACAROON="$(build_macaroon $FL_APP_SECRET third-parties app app::proctergamble-cargos-write)"
269 export PROCTER_GAMBLE_APP_PUSH_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_APP_PORT/api/proctergamble/cargo"
270 export TRANSPOREON_APP_PUSH_MACAROON="$(build_macaroon $FL_APP_SECRET third-parties app app::transporeon-cargos-write)"
271 export TRANSPOREON_APP_PUSH_URL="$FL_APPS_SCHEME://$FL_APPS_HOST:$FL_APP_PORT/api/transporeon/cargo"
272 export PROCTER_GAMBLE_CALLBACK_USER="{{ lookup('passwordstore', 'Travail/Fretlink/ProcterGamble/NotifierCallbackTest subkey=Login') }}"
273 export PROCTER_GAMBLE_CALLBACK_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/ProcterGamble/NotifierCallbackTest') }}"
274 export TRANSPOREON_CALLBACK_USER="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest subkey=Login') }}"
275 export TRANSPOREON_CALLBACK_PASSWORD="{{ lookup('passwordstore', 'Travail/Fretlink/Transporeon/NotifierCallbackTest') }}"
276fi
277
220if [ "$APP" = "pricer" ]; then 278if [ "$APP" = "pricer" ]; then
221 export GOOGLE_AUTH_CLIENT_ID="dummy" 279 export GOOGLE_AUTH_CLIENT_ID="dummy"
222fi 280fi
diff --git a/roles/lxde/files/config_files/lxterminal/lxterminal.conf b/roles/lxde/files/config_files/lxterminal/lxterminal.conf
index ef04c89..82d5242 100644
--- a/roles/lxde/files/config_files/lxterminal/lxterminal.conf
+++ b/roles/lxde/files/config_files/lxterminal/lxterminal.conf
@@ -3,24 +3,24 @@ fontname=Monospace 10
3selchars=-A-Za-z0-9,./?%&#:_ 3selchars=-A-Za-z0-9,./?%&#:_
4scrollback=1000 4scrollback=1000
5bgcolor=rgb(0,0,0) 5bgcolor=rgb(0,0,0)
6fgcolor=rgb(170,170,170) 6fgcolor=rgb(211,215,207)
7palette_color_0=rgb(0,0,0) 7palette_color_0=rgb(0,0,0)
8palette_color_1=rgb(170,0,0) 8palette_color_1=rgb(205,0,0)
9palette_color_2=rgb(0,170,0) 9palette_color_2=rgb(78,154,6)
10palette_color_3=rgb(170,85,0) 10palette_color_3=rgb(196,160,0)
11palette_color_4=rgb(0,0,170) 11palette_color_4=rgb(52,101,164)
12palette_color_5=rgb(170,0,170) 12palette_color_5=rgb(117,80,123)
13palette_color_6=rgb(0,170,170) 13palette_color_6=rgb(6,152,154)
14palette_color_7=rgb(170,170,170) 14palette_color_7=rgb(211,215,207)
15palette_color_8=rgb(85,85,85) 15palette_color_8=rgb(85,87,83)
16palette_color_9=rgb(255,85,85) 16palette_color_9=rgb(239,41,41)
17palette_color_10=rgb(85,255,85) 17palette_color_10=rgb(138,226,52)
18palette_color_11=rgb(255,255,85) 18palette_color_11=rgb(252,233,79)
19palette_color_12=rgb(85,85,255) 19palette_color_12=rgb(114,159,207)
20palette_color_13=rgb(255,85,255) 20palette_color_13=rgb(173,127,168)
21palette_color_14=rgb(85,255,255) 21palette_color_14=rgb(52,226,226)
22palette_color_15=rgb(255,255,255) 22palette_color_15=rgb(238,238,236)
23color_preset=VGA 23color_preset=Tango
24disallowbold=false 24disallowbold=false
25cursorblinks=false 25cursorblinks=false
26cursorunderline=false 26cursorunderline=false
diff --git a/roles/lxde/files/config_files/openbox/lxde-rc.xml b/roles/lxde/files/config_files/openbox/lxde-rc.xml
index 5003f15..db5393e 100644
--- a/roles/lxde/files/config_files/openbox/lxde-rc.xml
+++ b/roles/lxde/files/config_files/openbox/lxde-rc.xml
@@ -320,12 +320,12 @@
320 </keybind> 320 </keybind>
321 <keybind key='XF86AudioRaiseVolume'> 321 <keybind key='XF86AudioRaiseVolume'>
322 <action name='Execute'> 322 <action name='Execute'>
323 <command>bash -c &quot;pamixer --allow-boost -u -i 1; v=$HOME/.cache/dunstify_volume; vol=`pamixer --get-volume`; color=`[ $vol -le 100 ] &amp;&amp; echo normal || echo critical`; dunstify -r $(($(cat $v))) -p Volume --hints=int:value:$vol -i &apos; &apos; -a Openbox-volume -t 1000 -u $color &gt; $v&quot;</command> 323 <command>bash -c &quot;pamixer --allow-boost -u -i 1; v=$HOME/.cache/dunstify_volume; vol=`pamixer --get-volume`; color=`[ $vol -le 100 ] &amp;&amp; echo normal || echo critical`; dunstify -r $(($(head -n1 $v))) -p Volume --hints=int:value:$vol -i &apos; &apos; -a Openbox-volume -t 1000 -u $color &gt; $v&quot;</command>
324 </action> 324 </action>
325 </keybind> 325 </keybind>
326 <keybind key='XF86AudioLowerVolume'> 326 <keybind key='XF86AudioLowerVolume'>
327 <action name='Execute'> 327 <action name='Execute'>
328 <command>bash -c &quot;pamixer --allow-boost -u -d 1; v=$HOME/.cache/dunstify_volume; vol=`pamixer --get-volume`; color=`[ $vol -le 100 ] &amp;&amp; echo normal || echo critical`; dunstify -r $(($(cat $v))) -p Volume --hints=int:value:$vol -i &apos; &apos; -a Openbox-volume -t 1000 -u $color &gt; $v&quot;</command> 328 <command>bash -c &quot;pamixer --allow-boost -u -d 1; v=$HOME/.cache/dunstify_volume; vol=`pamixer --get-volume`; color=`[ $vol -le 100 ] &amp;&amp; echo normal || echo critical`; dunstify -r $(($(head -n1 $v))) -p Volume --hints=int:value:$vol -i &apos; &apos; -a Openbox-volume -t 1000 -u $color &gt; $v&quot;</command>
329 </action> 329 </action>
330 </keybind> 330 </keybind>
331 <keybind key='XF86AudioMute'> 331 <keybind key='XF86AudioMute'>
@@ -693,4 +693,4 @@
693 </menu> 693 </menu>
694 <!-- show the manage desktops section in the client-list-(combined-)menu --> 694 <!-- show the manage desktops section in the client-list-(combined-)menu -->
695 <applications/> 695 <applications/>
696</openbox_config> \ No newline at end of file 696</openbox_config>
diff --git a/roles/lxde/files/config_files/pcmanfm/LXDE/pcmanfm.conf b/roles/lxde/files/config_files/pcmanfm/LXDE/pcmanfm.conf
index ad0422b..cd38b55 100644
--- a/roles/lxde/files/config_files/pcmanfm/LXDE/pcmanfm.conf
+++ b/roles/lxde/files/config_files/pcmanfm/LXDE/pcmanfm.conf
@@ -7,8 +7,10 @@ mount_removable=1
7autorun=1 7autorun=1
8 8
9[autorun] 9[autorun]
10x-content/win32-software=pcmanfm 10x-content/ebook-reader=pcmanfm
11x-content/bootable-media=pcmanfm 11x-content/bootable-media=pcmanfm
12x-content/win32-software=pcmanfm
13x-content/audio-player=pcmanfm
12 14
13[ui] 15[ui]
14always_show_tabs=0 16always_show_tabs=0
diff --git a/roles/shell/bash/templates/bashrc.j2 b/roles/shell/bash/templates/bashrc.j2
index 2c5a999..1bf94e7 100644
--- a/roles/shell/bash/templates/bashrc.j2
+++ b/roles/shell/bash/templates/bashrc.j2
@@ -121,6 +121,10 @@ __prompt_command () {
121 PS1+="$green\u@\h$blue \w \$$d " 121 PS1+="$green\u@\h$blue \w \$$d "
122} 122}
123 123
124source /usr/share/fzf/key-bindings.bash
125source /usr/share/fzf/completion.bash
126export FZF_COMPLETION_TRIGGER='#'
127
124{% if "nodejs" in features.get(profile, []) %} 128{% if "nodejs" in features.get(profile, []) %}
125source /usr/share/nvm/init-nvm.sh 129source /usr/share/nvm/init-nvm.sh
126{% endif %} 130{% endif %}
diff --git a/roles/tools/files/vimrc b/roles/tools/files/vimrc
index 3c61621..3ce13d1 100644
--- a/roles/tools/files/vimrc
+++ b/roles/tools/files/vimrc
@@ -30,6 +30,8 @@ Plug 'vim-scripts/slapd.vim'
30Plug 'vimwiki/vimwiki', { 'branch': 'dev' } 30Plug 'vimwiki/vimwiki', { 'branch': 'dev' }
31Plug 'vim-vdebug/vdebug' 31Plug 'vim-vdebug/vdebug'
32Plug 'tpope/vim-fugitive' 32Plug 'tpope/vim-fugitive'
33Plug 'tpope/vim-rhubarb'
34Plug 'shumphrey/fugitive-gitlab.vim'
33Plug 'tomlion/vim-solidity' 35Plug 'tomlion/vim-solidity'
34Plug 'chrisbra/SudoEdit.vim' 36Plug 'chrisbra/SudoEdit.vim'
35Plug 'Chiel92/vim-autoformat' 37Plug 'Chiel92/vim-autoformat'
@@ -37,6 +39,9 @@ Plug 'pearofducks/ansible-vim'
37Plug 'juliosueiras/vim-terraform-completion' 39Plug 'juliosueiras/vim-terraform-completion'
38Plug 'sjl/gundo.vim' 40Plug 'sjl/gundo.vim'
39Plug 'LnL7/vim-nix' 41Plug 'LnL7/vim-nix'
42Plug 'purescript-contrib/purescript-vim'
43Plug 'vmchale/dhall-vim'
44Plug 'junegunn/fzf'
40 45
41call plug#end() 46call plug#end()
42 47
@@ -297,6 +302,7 @@ map <C-\> :tab split<CR>:exec("tag ".expand("<cword>"))<CR>
297map <A-]> :vsp <CR>:exec("tag ".expand("<cword>"))<CR> 302map <A-]> :vsp <CR>:exec("tag ".expand("<cword>"))<CR>
298 303
299let g:ctrlp_extensions = ['tag', 'buffertag', 'dir', 'undo', 'line'] 304let g:ctrlp_extensions = ['tag', 'buffertag', 'dir', 'undo', 'line']
305let g:ctrlp_max_files = 0
300set modeline 306set modeline
301 307
302set grepprg=grep\ -rn\ $*\ /dev/null 308set grepprg=grep\ -rn\ $*\ /dev/null
@@ -308,4 +314,3 @@ endif
308 314
309set list 315set list
310set listchars=tab:>-,trail:- 316set listchars=tab:>-,trail:-
311
diff --git a/roles/tools/templates/ssh_config.j2 b/roles/tools/templates/ssh_config.j2
index 63cfe81..f5a6210 100644
--- a/roles/tools/templates/ssh_config.j2
+++ b/roles/tools/templates/ssh_config.j2
@@ -11,3 +11,8 @@ User gitolite
11Host immae.eu 11Host immae.eu
12HostName immae.eu 12HostName immae.eu
13User immae 13User immae
14
15Host 443.immae.eu
16HostName 178.33.252.96
17User immae
18Port 443