From bf0e9d86db718602ee1ede80dab2b6ccb32b6253 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 15 Apr 2019 13:38:47 +0200 Subject: [PATCH 01/18] set mariadb --- group_vars/server | 4 +++- server.yml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/group_vars/server b/group_vars/server index e3a7e32..cbc8642 100644 --- a/group_vars/server +++ b/group_vars/server @@ -85,4 +85,6 @@ php_extention_enable: - iconv - mysqli - pdo_mysql - - soap \ No newline at end of file + - soap + +mysql_root_password: "{{ vault_default_password }}" \ No newline at end of file diff --git a/server.yml b/server.yml index 5a75d8f..02ee56a 100644 --- a/server.yml +++ b/server.yml @@ -16,6 +16,7 @@ - fail2ban - dns - {role: nginx, become: yes } + - {role: mariadb, become: yes } - php - tt-rss - gitea From ed7ea84dcb369a9e63d847b40fbbb717e4c4a123 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 15 Apr 2019 20:14:49 +0200 Subject: [PATCH 02/18] complete reeadme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ce1b2bc..06ed7fe 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ - [x] failtoban role -- [ ] nginx/php role +- [X] nginx/php role - install - config @@ -86,10 +86,10 @@ -slave/primary -- [ ] mariadb role +- [X] mariadb role - install - config - - backup + - (voir pouquoi l'init de mysql ne fonctionne pas dans ansible) - [ ] tt-rss role - depend nginx & madiadb role From 62861afa359195bd9fd9251b69b9b2b54aa2b4fb Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 16 Apr 2019 16:47:44 +0200 Subject: [PATCH 03/18] add arch3 --- staging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staging b/staging index 890b7a2..fc2b473 100644 --- a/staging +++ b/staging @@ -8,5 +8,5 @@ arch2 [server] nas - +arch3 From fbcf769a4c9a1af3f137a1349c46e8fe4435a7f6 Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 16 Apr 2019 16:48:36 +0200 Subject: [PATCH 04/18] --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 06ed7fe..3535cf8 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ - [x] davfs mount - [x] VM server - + - [x] syncthing role ### Workstation roles @@ -78,7 +78,7 @@ - [x] failtoban role -- [X] nginx/php role +- [x] nginx/php role - install - config @@ -86,7 +86,7 @@ -slave/primary -- [X] mariadb role +- [x] mariadb role - install - config - (voir pouquoi l'init de mysql ne fonctionne pas dans ansible) From 45fbc3316f26953f57c7e48f42c7cf8ba6684269 Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 16 Apr 2019 17:54:22 +0200 Subject: [PATCH 05/18] custom dns role --- README.md | 5 +---- group_vars/server | 18 +++++++++++++++++- server.yml | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3535cf8..ae89b9a 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ - install - config -- [ ] dns role +- [x] dns role -slave/primary @@ -98,9 +98,6 @@ - [ ] gitea role - depend of mariadb role -- [ ] dns role - -slave/primary - - [ ] backup role? - controle du reboot diff --git a/group_vars/server b/group_vars/server index cbc8642..9c30a02 100644 --- a/group_vars/server +++ b/group_vars/server @@ -87,4 +87,20 @@ php_extention_enable: - pdo_mysql - soap -mysql_root_password: "{{ vault_default_password }}" \ No newline at end of file +mysql_root_password: "{{ vault_default_password }}" + + +bind_listen_ipv4: ['any'] +bind_allow_query: ['any'] +bind_zone_master_server_ip: 192.168.1.10 +bind_zone_domains: + - name: ducamps.win + hostmaster_email: "vincent@ducamps.win" + - name: 1.168.192.in-addr.arpa + hostmaster_email: "vincent@ducamps.win" +bind_forwarders: + - '1.1.1.1' + - '80.67.169.40' +bind_recursion: true +bind_allow_recursion: + - "192.168.1.0/24" \ No newline at end of file diff --git a/server.yml b/server.yml index 02ee56a..e9d977f 100644 --- a/server.yml +++ b/server.yml @@ -14,7 +14,7 @@ - rsyncd - gandi-dyn-dns - fail2ban - - dns + - {role: dns , become: yes } - {role: nginx, become: yes } - {role: mariadb, become: yes } - php From a06dd92b7db79b181f223e299ecb45379487a28c Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 16 Apr 2019 19:54:24 +0200 Subject: [PATCH 06/18] fix mariadb issue --- group_vars/all/all_vault | 19 ++++++++++--------- group_vars/server | 3 ++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/group_vars/all/all_vault b/group_vars/all/all_vault index bda2981..a60b3b2 100644 --- a/group_vars/all/all_vault +++ b/group_vars/all/all_vault @@ -1,10 +1,11 @@ $ANSIBLE_VAULT;1.1;AES256 -36336139353839303537376234623535363838613761633137633166636261353862643935393563 -6363356531376261333364306238343961343435336637380a623134636661326262623635326266 -62623433343939353866373365343966656533376230323835313131326130326265316364336537 -6332306265643336630a326530656536373662613636353735666164326461333232363534316564 -36643333636464663734666364366436366235326136313134393965626636643034396662383261 -34363236653530326635303239643166313966363062333534616332383736626430346633396438 -61353964643930353731316664393534356366373563326337303964323366333733386134646337 -31303736383735366662323637336635656161376337313563386438376136653365656433663336 -3530 +66363162333638663431363630666135616261633634336561373331306231396335393530333938 +3263393132303633336231356334313064666433313761350a316165656230396265306130386433 +32333934313839363038356236396134363265393039343332643864633737356338353034303734 +3165653730366536310a393463383139313766323238306565326539643761323561306537383939 +61336236393835366362653533346564306232323732393237633630636334303563323264353365 +35313361353665653163303230333064653132343636646439316332393038356263343536666137 +37633265353963326561323036353933663062373432383234336635336634383138626639623561 +35343230663933353363663765336331353364353735393566633632303362396239346534363633 +62313834623033333066366334366561646136633938643134366566663762336430653936626532 +3066623066346637653936366261353930663432613936303963 diff --git a/group_vars/server b/group_vars/server index 9c30a02..53c0688 100644 --- a/group_vars/server +++ b/group_vars/server @@ -87,7 +87,8 @@ php_extention_enable: - pdo_mysql - soap -mysql_root_password: "{{ vault_default_password }}" +mysql_root_password: "{{ vault_mysql_root }}" +mysql_root_password_update: true bind_listen_ipv4: ['any'] From d03f57d1c21a8be1a9c052c66c7a61849920f554 Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 17 Apr 2019 13:37:19 +0200 Subject: [PATCH 07/18] create tt-rss role --- group_vars/all/all_vault | 26 ++++++++++++++++---------- group_vars/server | 22 +++++++++++++++++++++- host_vars/arch3 | 1 + host_vars/pi2 | 1 + 4 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 host_vars/arch3 diff --git a/group_vars/all/all_vault b/group_vars/all/all_vault index a60b3b2..bcdac52 100644 --- a/group_vars/all/all_vault +++ b/group_vars/all/all_vault @@ -1,11 +1,17 @@ $ANSIBLE_VAULT;1.1;AES256 -66363162333638663431363630666135616261633634336561373331306231396335393530333938 -3263393132303633336231356334313064666433313761350a316165656230396265306130386433 -32333934313839363038356236396134363265393039343332643864633737356338353034303734 -3165653730366536310a393463383139313766323238306565326539643761323561306537383939 -61336236393835366362653533346564306232323732393237633630636334303563323264353365 -35313361353665653163303230333064653132343636646439316332393038356263343536666137 -37633265353963326561323036353933663062373432383234336635336634383138626639623561 -35343230663933353363663765336331353364353735393566633632303362396239346534363633 -62313834623033333066366334366561646136633938643134366566663762336430653936626532 -3066623066346637653936366261353930663432613936303963 +30376330376664643561613731323036336335613765393034313734316335356563333663343439 +6232373039336233313865646534326636653665303039650a316266643537363563333163383938 +32326462306539656432653030316462386561636463666538376130623435386265353238646634 +6330303831383436610a373437373439343564633537393838653163663630366561396162373563 +33333661653631356630336362396631633436326537626662363936353834366337663065376235 +63663063653436323938616666333963643738653766643835393039653931353930326630353936 +65393461373934313163326362346166303761333565376533646534396236346339323539336536 +63613331306563383432366430303630313835623339396638333636643463636235323335353163 +62303261303261636438353637383261616436623162343964626135373130316533373937666164 +35333865353237333332626430393866396161633038363638666463303038306435363935626532 +31633238653538636237306431643638313030633261366365353035643038653763636530656336 +64346632653763306239663365643239366465333962636662353231373533636366636362313261 +66306136363464613634353031383265323838626561643538663031383661373939303432666230 +61616536636165373361376161303664616436666137616536623133336530316332663662326138 +33353562663836313265393332623835343233623965646337356530373837393533663237383066 +38663037646565396535 diff --git a/group_vars/server b/group_vars/server index 53c0688..d8b44aa 100644 --- a/group_vars/server +++ b/group_vars/server @@ -89,7 +89,27 @@ php_extention_enable: mysql_root_password: "{{ vault_mysql_root }}" mysql_root_password_update: true +mysql_databases: + - name: gitea + collation: utf8mb4_unicode_ci + encoding: utf8mb4 + +# Users. +mysql_users: + + - name: gitea + host: localhost + password: "{{ vault_mysql_gitea }}" + priv: gitea.*:ALL + + - name: dump + host: localhost + password: "{{ vault_mysql_dump }}" + priv: "*.*:SELECT,SHOW DATABASES" + +ttrss_db_password: "{{ vault_mysql_ttrss }}" +ttrss_log_destination: "" bind_listen_ipv4: ['any'] bind_allow_query: ['any'] @@ -104,4 +124,4 @@ bind_forwarders: - '80.67.169.40' bind_recursion: true bind_allow_recursion: - - "192.168.1.0/24" \ No newline at end of file + - "192.168.1.0/24" diff --git a/host_vars/arch3 b/host_vars/arch3 new file mode 100644 index 0000000..a7a206e --- /dev/null +++ b/host_vars/arch3 @@ -0,0 +1 @@ +ttrss_url_path: http://arch3/tt-rss/ \ No newline at end of file diff --git a/host_vars/pi2 b/host_vars/pi2 index e69de29..725e3b8 100644 --- a/host_vars/pi2 +++ b/host_vars/pi2 @@ -0,0 +1 @@ +ttrss_url_path: "https://www.{{domain.name}}/tt-rss" \ No newline at end of file From 9d183e867a17ecaa85c1b7d924b593609fa3045a Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 17 Apr 2019 21:07:25 +0200 Subject: [PATCH 08/18] add gitea role --- group_vars/server | 10 ++++++++++ host_vars/arch3 | 5 ++++- host_vars/pi2 | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/group_vars/server b/group_vars/server index d8b44aa..65c4c46 100644 --- a/group_vars/server +++ b/group_vars/server @@ -125,3 +125,13 @@ bind_forwarders: bind_recursion: true bind_allow_recursion: - "192.168.1.0/24" + +gitea_http_listen: 0.0.0.0 +gitea_db_type: mysql +gitea_db_host: localhost:3306 +gitea_db_name: gitea +gitea_db_user: gitea +gitea_db_password: "{{ vault_mysql_gitea }}" +gitea_ssh_domain: "{{ansible_hostname}}" +gitea_start_ssh: false +gitea_ssh_port: 22 \ No newline at end of file diff --git a/host_vars/arch3 b/host_vars/arch3 index a7a206e..431807b 100644 --- a/host_vars/arch3 +++ b/host_vars/arch3 @@ -1 +1,4 @@ -ttrss_url_path: http://arch3/tt-rss/ \ No newline at end of file +ttrss_url_path: http://arch3/tt-rss/ + +gitea_http_domain: arch3 +gitea_root_url: http://arch3:3000 \ No newline at end of file diff --git a/host_vars/pi2 b/host_vars/pi2 index 725e3b8..f7aaaea 100644 --- a/host_vars/pi2 +++ b/host_vars/pi2 @@ -1 +1,3 @@ -ttrss_url_path: "https://www.{{domain.name}}/tt-rss" \ No newline at end of file +ttrss_url_path: "https://www.{{domain.name}}/tt-rss" +gitea_http_domain: git.{{domain.name}} +gitea_root_url: https://git.{{domain.name}} \ No newline at end of file From 690b98abec23c70f19da90b1b9942d5593881fbb Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 17 Apr 2019 21:10:11 +0200 Subject: [PATCH 09/18] complete readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ae89b9a..76a5c41 100644 --- a/README.md +++ b/README.md @@ -91,11 +91,11 @@ - config - (voir pouquoi l'init de mysql ne fonctionne pas dans ansible) -- [ ] tt-rss role +- [x] tt-rss role - depend nginx & madiadb role - fail2ban jail -- [ ] gitea role +- [x] gitea role - depend of mariadb role - [ ] backup role? From cb6f8913b00856ac026da59e2eda39d255fed12b Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 19 Apr 2019 19:58:52 +0200 Subject: [PATCH 10/18] correct database issue --- group_vars/server | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/group_vars/server b/group_vars/server index 65c4c46..c38423e 100644 --- a/group_vars/server +++ b/group_vars/server @@ -106,7 +106,7 @@ mysql_users: - name: dump host: localhost password: "{{ vault_mysql_dump }}" - priv: "*.*:SELECT,SHOW DATABASES" + priv: "*.*:SELECT,SHOW DATABASES,LOCK TABLES" ttrss_db_password: "{{ vault_mysql_ttrss }}" ttrss_log_destination: "" From 9325fbf62c2f796e7332750540664ba5ccd2a2cc Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 23 Apr 2019 18:34:18 +0200 Subject: [PATCH 11/18] database modif gitea --- group_vars/server | 16 ++++------------ host_vars/nas | 4 ++++ server.yml | 3 ++- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/group_vars/server b/group_vars/server index c38423e..7fc90c2 100644 --- a/group_vars/server +++ b/group_vars/server @@ -89,20 +89,10 @@ php_extention_enable: mysql_root_password: "{{ vault_mysql_root }}" mysql_root_password_update: true -mysql_databases: - - name: gitea - collation: utf8mb4_unicode_ci - encoding: utf8mb4 - + # Users. mysql_users: - - - name: gitea - host: localhost - password: "{{ vault_mysql_gitea }}" - priv: gitea.*:ALL - - name: dump host: localhost password: "{{ vault_mysql_dump }}" @@ -110,6 +100,7 @@ mysql_users: ttrss_db_password: "{{ vault_mysql_ttrss }}" ttrss_log_destination: "" +ttrss_SQl_target_file: /mnt/diskstation/git/backup/mysql/last/ttrss.sql bind_listen_ipv4: ['any'] bind_allow_query: ['any'] @@ -134,4 +125,5 @@ gitea_db_user: gitea gitea_db_password: "{{ vault_mysql_gitea }}" gitea_ssh_domain: "{{ansible_hostname}}" gitea_start_ssh: false -gitea_ssh_port: 22 \ No newline at end of file +gitea_ssh_port: 22 +gitea_SQl_target_file: /mnt/diskstation/git/backup/mysql/last/gitea.sql \ No newline at end of file diff --git a/host_vars/nas b/host_vars/nas index 17c2657..53818f7 100644 --- a/host_vars/nas +++ b/host_vars/nas @@ -1,2 +1,6 @@ ##ansible_python_interpreter: /usr/bin/python2 ##music_directory: '/mnt/diskstation/music' +ttrss_url_path: http://nas/tt-rss/ + +gitea_http_domain: nas +gitea_root_url: http://nas:3000 \ No newline at end of file diff --git a/server.yml b/server.yml index e9d977f..dd905c1 100644 --- a/server.yml +++ b/server.yml @@ -9,6 +9,7 @@ become: yes roles: + - user_config - ssmtp - cronie - rsyncd @@ -20,5 +21,5 @@ - php - tt-rss - gitea - - user_config + From 9f956b6f383ec1e3404aba2638725d3ac88caca6 Mon Sep 17 00:00:00 2001 From: vincent Date: Thu, 25 Apr 2019 21:10:23 +0200 Subject: [PATCH 12/18] change nginx config to add include location --- group_vars/server | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/group_vars/server b/group_vars/server index 7fc90c2..869d4c2 100644 --- a/group_vars/server +++ b/group_vars/server @@ -59,15 +59,15 @@ nginx_vhosts: location = /50x.html { root /usr/share/nginx/html; } - - location =/ { - rewrite ^ /starter; - } - location / { + location / { index index.php index.html index.htm ; default_type text/html; } + location =/ { + rewrite ^ /starter; + } + location ~ \.php$ { # try_files $uri =404; fastcgi_split_path_info ^(.+\.php)(/.+)$; @@ -77,6 +77,7 @@ nginx_vhosts: fastcgi_index index.php; include fastcgi_params; } + include /etc/nginx/conf.d/*.default; nginx_realIP_Proxy: 192.168.1.10/24 From 0134428689190aa801eaf727bb723936833d76ad Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 26 Apr 2019 14:05:09 +0200 Subject: [PATCH 13/18] ADD dedicated playbook to chaine tv --- chainetv.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 chainetv.yml diff --git a/chainetv.yml b/chainetv.yml new file mode 100644 index 0000000..0af4eee --- /dev/null +++ b/chainetv.yml @@ -0,0 +1,8 @@ +--- +- hosts: server + + + roles: + - {role: nginx, become: yes } + - chainetv + From 14d7f9380391ed3d1d6e2c17718df7436ccce1e6 Mon Sep 17 00:00:00 2001 From: vincent Date: Fri, 26 Apr 2019 14:28:23 +0200 Subject: [PATCH 14/18] modif nginx dependancy for chaine tv --- chainetv.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/chainetv.yml b/chainetv.yml index 0af4eee..3ad287c 100644 --- a/chainetv.yml +++ b/chainetv.yml @@ -3,6 +3,5 @@ roles: - - {role: nginx, become: yes } - chainetv From 0e6375e02f1f8814d781591a790b8f630c831920 Mon Sep 17 00:00:00 2001 From: vincent Date: Sat, 27 Apr 2019 18:06:20 +0200 Subject: [PATCH 15/18] integer chainetv role in playbook --- chainetv.yml | 3 ++- server.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chainetv.yml b/chainetv.yml index 3ad287c..8a3f374 100644 --- a/chainetv.yml +++ b/chainetv.yml @@ -1,6 +1,7 @@ --- - hosts: server - + vars: + force_site_update: true roles: - chainetv diff --git a/server.yml b/server.yml index dd905c1..5b45bc2 100644 --- a/server.yml +++ b/server.yml @@ -21,5 +21,5 @@ - php - tt-rss - gitea - + - chainetv From c6a4c27ffe29a95e2f8e61f7b5091d549a359838 Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 29 Apr 2019 16:45:31 +0200 Subject: [PATCH 16/18] add branch variable chainetv --- host_vars/arch3 | 4 +++- host_vars/nas | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/host_vars/arch3 b/host_vars/arch3 index 431807b..4931a29 100644 --- a/host_vars/arch3 +++ b/host_vars/arch3 @@ -1,4 +1,6 @@ ttrss_url_path: http://arch3/tt-rss/ gitea_http_domain: arch3 -gitea_root_url: http://arch3:3000 \ No newline at end of file +gitea_root_url: http://arch3:3000 + +chainetv_repo_branch: dev \ No newline at end of file diff --git a/host_vars/nas b/host_vars/nas index 53818f7..52c9633 100644 --- a/host_vars/nas +++ b/host_vars/nas @@ -3,4 +3,6 @@ ttrss_url_path: http://nas/tt-rss/ gitea_http_domain: nas -gitea_root_url: http://nas:3000 \ No newline at end of file +gitea_root_url: http://nas:3000 + +chainetv_repo_branch: dev \ No newline at end of file From 676856f4a3d08a18fa754483bdc80d410601af5d Mon Sep 17 00:00:00 2001 From: vincent Date: Mon, 13 May 2019 19:00:10 +0200 Subject: [PATCH 17/18] create supysonic role --- group_vars/all/all_vault | 34 ++++++++++++++++++---------------- group_vars/server | 4 +++- supysonic.yml | 8 ++++++++ 3 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 supysonic.yml diff --git a/group_vars/all/all_vault b/group_vars/all/all_vault index bcdac52..0984003 100644 --- a/group_vars/all/all_vault +++ b/group_vars/all/all_vault @@ -1,17 +1,19 @@ $ANSIBLE_VAULT;1.1;AES256 -30376330376664643561613731323036336335613765393034313734316335356563333663343439 -6232373039336233313865646534326636653665303039650a316266643537363563333163383938 -32326462306539656432653030316462386561636463666538376130623435386265353238646634 -6330303831383436610a373437373439343564633537393838653163663630366561396162373563 -33333661653631356630336362396631633436326537626662363936353834366337663065376235 -63663063653436323938616666333963643738653766643835393039653931353930326630353936 -65393461373934313163326362346166303761333565376533646534396236346339323539336536 -63613331306563383432366430303630313835623339396638333636643463636235323335353163 -62303261303261636438353637383261616436623162343964626135373130316533373937666164 -35333865353237333332626430393866396161633038363638666463303038306435363935626532 -31633238653538636237306431643638313030633261366365353035643038653763636530656336 -64346632653763306239663365643239366465333962636662353231373533636366636362313261 -66306136363464613634353031383265323838626561643538663031383661373939303432666230 -61616536636165373361376161303664616436666137616536623133336530316332663662326138 -33353562663836313265393332623835343233623965646337356530373837393533663237383066 -38663037646565396535 +66373932613336323337303165393131656639616164393765646533343937346638343235623665 +3764663835643766636165386231633538323730303865350a373730356638316331643332386236 +65346662623063613933663233376239333664396431333264366464386632333936653130353431 +6538366132316333310a393537373862363439346565613566636330613934363136373131353161 +30313339343332396132666234646130666661356236333937343730386539656562343538656265 +35366237646264393466353835383439616264623737366230303833353033616163326635396539 +62363761313663326131363334323761336531353564323565373132393134383664353061396166 +65396530313165353164636239383038316137616437333962613662653535343938646637336233 +31393162623762643038323139313464393965613539353331646134653463306137653661303539 +31356235656231303261306465393836326362343262613134373566393035396165313235623265 +37333162313535653838353633626665623030663663386362663037323230393438333832376238 +31383734653733636337616639323161316535363636663236346234323833303662346230626565 +65633730363937646237643035366535393063653962346536616361666232336466663233313063 +64363864336237343739653065663730353031363130396134393337346465396164386161303938 +61303334323939616437313763663164323937386266666530373732613962366130326435613563 +62326332646561363365376363616431623330373561623761383336303835323765383831353064 +32643235316130333039616538326533636466346439616261616139326262396631386239653138 +6165613133656637633766643434376566393134643731343534 diff --git a/group_vars/server b/group_vars/server index 869d4c2..2145027 100644 --- a/group_vars/server +++ b/group_vars/server @@ -127,4 +127,6 @@ gitea_db_password: "{{ vault_mysql_gitea }}" gitea_ssh_domain: "{{ansible_hostname}}" gitea_start_ssh: false gitea_ssh_port: 22 -gitea_SQl_target_file: /mnt/diskstation/git/backup/mysql/last/gitea.sql \ No newline at end of file +gitea_SQl_target_file: /mnt/diskstation/git/backup/mysql/last/gitea.sql + +supysonic_db_password: "{{ vault_mysql_supysonic }}" \ No newline at end of file diff --git a/supysonic.yml b/supysonic.yml new file mode 100644 index 0000000..bd56c72 --- /dev/null +++ b/supysonic.yml @@ -0,0 +1,8 @@ +--- +- hosts: server + vars: + force_site_update: true + + roles: + - supysonic + From e8b67647c43958b18d1187b43bdf9eac931840e1 Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 14 May 2019 10:24:06 +0200 Subject: [PATCH 18/18] add music folder to server --- group_vars/server | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/group_vars/server b/group_vars/server index 2145027..ff2c313 100644 --- a/group_vars/server +++ b/group_vars/server @@ -14,10 +14,26 @@ systemd_mounts: - uid=1024 - guid=100 automount: true - + diskstation_music: + share: //diskstation.ducamps.win/music + mount: /mnt/diskstation/music + type: cifs + options: + - credentials=/etc/creds/.diskstation_credentials + - uid=1024 + - gid=100 + automount: true systemd_mounts_enabled: - diskstation_git - - backup_disk + - diskstation_music + - backup_disk + +credentials_files: + 1: + type: smb + path: /etc/creds/.diskstation_credentials + username: admin + password: "{{ vault_default_password }}" syncthing_address: "{{inventory_hostname}}:8384" syncthing_gui_user: "{{user.name}}"