diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg deleted file mode 100644 index e75f79b..0000000 --- a/ansible/ansible.cfg +++ /dev/null @@ -1,11 +0,0 @@ -[defaults] -hash_behaviour = merge -host_key_checking = False -#callback_whitelist = profile_tasks -display_skipped_hosts = False -stdout_callback = yaml -bin_ansible_callbacks = True - -[ssh_connection] -pipelining = True -ssh_args = -o ForwardAgent=yes diff --git a/ansible/deploy.yml b/ansible/deploy.yml deleted file mode 100644 index ed386b8..0000000 --- a/ansible/deploy.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- hosts: all - vars: - ansible_user: "{{ deploy_user }}" - roles: - - ansible-deploy - - build - post_tasks: - - include_role: - name: ansible-deploy - tasks_from: complete.yml - - include_role: - name: service - tasks_from: restart.yml diff --git a/ansible/dev/inventory.yml b/ansible/dev/inventory.yml deleted file mode 100644 index 47e4ee3..0000000 --- a/ansible/dev/inventory.yml +++ /dev/null @@ -1,2 +0,0 @@ -all: - hosts: localhost diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml deleted file mode 100644 index b7328cf..0000000 --- a/ansible/group_vars/all.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -project_name: tankz -project_user: holop - -deploy_user: "{{ project_user }}" -deploy_project: "{{ project_name }}" -deploy_repo_url: "git@bitbucket.org:infernalgames/{{ project_name }}.git" -deploy_repo_version: develop -deploy_npm: yes - -service_name: "{{ project_name }}" -service_work_dir: "{{ deploy_current_dir }}/target/server/cpp" -service_command: "{{ service_work_dir }}/{{ project_name }} {{ service_host }}" -service_user: www-data -service_control_user: "{{ project_user }}" diff --git a/ansible/prod/inventory.yml b/ansible/prod/inventory.yml deleted file mode 100644 index 72ba505..0000000 --- a/ansible/prod/inventory.yml +++ /dev/null @@ -1,5 +0,0 @@ -all: - hosts: shmyga.ru - vars: - service_host: 213.139.208.180 - config_src: "/home/holop/tankz/config.json" diff --git a/ansible/requirements.yml b/ansible/requirements.yml deleted file mode 100644 index 41bc812..0000000 --- a/ansible/requirements.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: ansible-deploy - src: git@bitbucket.org:shmyga/ansible-deploy.git - version: master - scm: git - -- name: geerlingguy.nodejs \ No newline at end of file diff --git a/ansible/roles/build/defaults/main.yml b/ansible/roles/build/defaults/main.yml deleted file mode 100644 index e711e90..0000000 --- a/ansible/roles/build/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -config_src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json" -config_dest: "{{ deploy_release_dir }}/config.json" diff --git a/ansible/roles/build/tasks/main.yml b/ansible/roles/build/tasks/main.yml deleted file mode 100644 index de88acc..0000000 --- a/ansible/roles/build/tasks/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: "Copy config" - copy: - src: "{{ config_src }}" - dest: "{{ config_dest }}" - remote_src: true - -- name: "Gulp build" - command: "{{ deploy_release_dir }}/node_modules/.bin/gulp default --host shmyga.ru" - args: - chdir: "{{ deploy_release_dir }}" diff --git a/ansible/roles/service/defaults/main.yml b/ansible/roles/service/defaults/main.yml deleted file mode 100644 index 838b6a9..0000000 --- a/ansible/roles/service/defaults/main.yml +++ /dev/null @@ -1,6 +0,0 @@ -service_name: null -service_description: "{{ service_name }} service" -service_work_dir: null -service_command: null -service_user: null -service_control_user: null \ No newline at end of file diff --git a/ansible/roles/service/tasks/main.yml b/ansible/roles/service/tasks/main.yml deleted file mode 100644 index 5484aae..0000000 --- a/ansible/roles/service/tasks/main.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -- name: "Install {{ service_name }} systemd unit file" - template: - src: "template/service.j2" - dest: "/etc/systemd/system/{{ service_name }}.service" - -- name: "Start {{ service_name }} service" - systemd: - enabled: yes - state: started - name: "{{ service_name }}" - daemon_reload: yes - -- name: "Add sudoers record for {{ service_name }} service" - lineinfile: - path: /etc/sudoers.d/{{ service_name }} - state: present - create: yes - regexp: "^{{ service_control_user }} ALL=" - line: "{{ service_control_user }} ALL= NOPASSWD: /bin/systemctl * {{ service_name }}" - validate: "/usr/sbin/visudo -cf %s" diff --git a/ansible/roles/service/tasks/restart.yml b/ansible/roles/service/tasks/restart.yml deleted file mode 100644 index 3fc44e9..0000000 --- a/ansible/roles/service/tasks/restart.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# - name: "Restart {{ service_name }} service" -# systemd: -# enabled: yes -# state: restarted -# name: "{{ service_name }}" - -- name: "Restart {{ service_name }} service" - command: "sudo /bin/systemctl restart {{ service_name }}" - args: - warn: no diff --git a/ansible/roles/service/template/service.j2 b/ansible/roles/service/template/service.j2 deleted file mode 100644 index cb9b721..0000000 --- a/ansible/roles/service/template/service.j2 +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description={{ service_description }} - -[Service] -Type=simple -PIDFile=/var/run/{{ service_name }}.pid -WorkingDirectory={{ service_work_dir }} -User={{ service_user }} -Group={{ service_user }} -ExecStart={{ service_command }} -TimeoutSec=300 -Restart=always - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/roles/setup/tasks/apt.yml b/ansible/roles/setup/tasks/apt.yml deleted file mode 100644 index f182bee..0000000 --- a/ansible/roles/setup/tasks/apt.yml +++ /dev/null @@ -1,3 +0,0 @@ -- name: "Install neko package" - apt: - name: neko diff --git a/ansible/roles/setup/tasks/main.yml b/ansible/roles/setup/tasks/main.yml deleted file mode 100644 index 5ba5368..0000000 --- a/ansible/roles/setup/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -- import_tasks: apt.yml - when: ansible_distribution|lower == 'ubuntu' diff --git a/ansible/roles/user/keys/shmyga.pub b/ansible/roles/user/keys/shmyga.pub deleted file mode 100644 index de37670..0000000 --- a/ansible/roles/user/keys/shmyga.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCot1zSeqj7Tj5/7aNMzXAuXQPPxudYFV9z6M03dPijh2bXyHDcXk53xUO8XY5R4GyLhvAn98axbPM++urKY8BXuQqAG36soI7iZJ/KcPY1EKDwVBeZneFC/wMc8HMT0hj9+uHcGAMtmklIgPPkawzLxbEh6oAY4H8Vvz08qyco6suYB5NjkpFwVMf9Xa2Fj8rTodKpPRDBh/Xk+5bh11RKL6b9WcwuwpKU8zl2qZiqNfjr0H+sKEk7ohcYvzSCltLdKJcoKbiCcnrnBJT5/JpGWeAbA2MMmvmt/dJrHykd1CbmXW2DuG4tIlwMb5xU739PoKCePctK1retb8TrWOLT shmyga@shmyga-desktop diff --git a/ansible/roles/user/tasks/main.yml b/ansible/roles/user/tasks/main.yml deleted file mode 100644 index 7c509d0..0000000 --- a/ansible/roles/user/tasks/main.yml +++ /dev/null @@ -1,40 +0,0 @@ -# barin -- name: Make barin group - group: - name: barin - state: present - -- name: Make barin user - user: - name: barin - group: barin - password: '$6$mbw5KZWwtrRUy$eFcMNTW.QzG1Em45r5hZf/qri4hKAHImozWuW4/pYnDK.tOrVKrXTKYfRDtYEFRgCgVVg0zuPvyq/xn0KiKlz0' - groups: www-data,sudo,adm - -- name: Set up authorized_keys for the barin user - authorized_key: - user: barin - key: '{{ item }}' - with_file: - - keys/shmyga.pub - - -# holop -- name: Make holop group - group: - name: holop - state: present - -- name: Make holop user - user: - name: holop - group: holop - password: '$6$B/7g0xlcXFCIHk$hzSjb8KLll7YrTsp3z640sxNixNAkLpm6UUdZgWPh0Ffy7Ue18AiXTzkDdGTaTH6Woz4kvgVDSggnKGTU6u03.' - groups: www-data - -- name: Set up authorized_keys for the holop user - authorized_key: - user: holop - key: '{{ item }}' - with_file: - - keys/shmyga.pub \ No newline at end of file diff --git a/ansible/roles/user/vars/main.yml b/ansible/roles/user/vars/main.yml deleted file mode 100644 index c23ca56..0000000 --- a/ansible/roles/user/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ -ansible_become: yes \ No newline at end of file diff --git a/ansible/service.yml b/ansible/service.yml deleted file mode 100644 index f2742df..0000000 --- a/ansible/service.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- hosts: all - vars: - ansible_user: "{{ deploy_user }}" - tasks: - - include_role: - name: service - tasks_from: restart.yml diff --git a/ansible/setup.yml b/ansible/setup.yml deleted file mode 100644 index eb633fd..0000000 --- a/ansible/setup.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- hosts: - - all - pre_tasks: - - include_role: - name: ansible-deploy - tasks_from: facts.yml - roles: - - geerlingguy.nodejs - - setup - - service - vars: - nodejs_version: 9.x - nodejs_npm_global_packages: [gulp-cli] - vars_files: - - vars/barin.yml diff --git a/ansible/user.yml b/ansible/user.yml deleted file mode 100644 index 5542483..0000000 --- a/ansible/user.yml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - gather_facts: no - roles: - - user diff --git a/ansible/vars/barin.yml b/ansible/vars/barin.yml deleted file mode 100644 index 7f2633c..0000000 --- a/ansible/vars/barin.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -ansible_user: barin -ansible_become_pass: 1234!QAZ -ansible_become: yes