diff --git a/applications.yml b/applications.yml index 6e054f0..e44404f 100644 --- a/applications.yml +++ b/applications.yml @@ -8,7 +8,6 @@ - tohtori vars_files: - vars/application_secret_vars.yml - - vars/ejson_key.yml tasks: - include: roles/nginx/tasks/nginx_config.yml handlers: diff --git a/base.yml b/base.yml index 0b7ce06..3be0b25 100644 --- a/base.yml +++ b/base.yml @@ -5,11 +5,13 @@ gather_facts: yes vars_files: - vars/users.yml + - vars/ejson_key.yml - roles/koodiklinikka.fi/defaults/main.yml - roles/koodiklinikka.fi-api/defaults/main.yml roles: - base - docker - nginx + - newrelic_container tasks: - include: tasks/webuser.yml diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml index 0c044c3..d93017b 100644 --- a/roles/base/defaults/main.yml +++ b/roles/base/defaults/main.yml @@ -3,3 +3,5 @@ users: [] locale: LC_CTYPE: fi_FI.UTF-8 LANG: en_US.UTF-8 +ejson_public: 94f3af35ad208d7bc7e3ddf1f9d181d090e3a1c74f9d56851c4f0f1efb04b571 + diff --git a/roles/tohtori/tasks/deploy_ejson.yml b/roles/base/tasks/deploy_ejson.yml similarity index 100% rename from roles/tohtori/tasks/deploy_ejson.yml rename to roles/base/tasks/deploy_ejson.yml diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 7cf5296..10f6d8d 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -1,5 +1,6 @@ --- - include: deps_for_ansible.yml tags=base,dependencies +- include: deploy_ejson.yml tags=base,ejson - include: locale.yml tags=base,locale - include: users.yml tags=base,users - include: packages.yml tags=base,packages diff --git a/roles/newrelic_container/.DS_Store b/roles/newrelic_container/.DS_Store new file mode 100644 index 0000000..344932c Binary files /dev/null and b/roles/newrelic_container/.DS_Store differ diff --git a/roles/newrelic_container/defaults/main.yml b/roles/newrelic_container/defaults/main.yml new file mode 100644 index 0000000..ea79f9b --- /dev/null +++ b/roles/newrelic_container/defaults/main.yml @@ -0,0 +1,8 @@ +$ANSIBLE_VAULT;1.1;AES256 +35363731316437353333383261313965613436353833633161656135313939343137316136396266 +3963653938303161316536636234303839336565613536660a626564366132653262393032323562 +33383931623037623034626362346266333639353862323235306236656465316536643535363232 +3361366665373566330a623361633166313962366365303962636564303737316538366232366361 +37623434313136376461653137346634653633336431663737663335376133623866663530643435 +37363961646534336163346532663634656334666363306235346363383031376161636433383065 +376139346530336632386230373838383439 diff --git a/roles/newrelic_container/tasks/main.yml b/roles/newrelic_container/tasks/main.yml new file mode 100644 index 0000000..3b5e784 --- /dev/null +++ b/roles/newrelic_container/tasks/main.yml @@ -0,0 +1,4 @@ +--- + +- name: Start the container + shell: docker run --restart=always -d -e NEW_RELIC_LICENSE_KEY={{ newrelic_key }} --name newrelic_sysmond --hostname `hostname` uzyexe/newrelic diff --git a/roles/tohtori/tasks/main.yml b/roles/tohtori/tasks/main.yml index 0376b90..714c900 100644 --- a/roles/tohtori/tasks/main.yml +++ b/roles/tohtori/tasks/main.yml @@ -1,4 +1,3 @@ --- - include: tohtori_user.yml -- include: deploy_ejson.yml - include: build.yml