Merge branch 'master' into feature/7-ejabberd
This commit is contained in:
		
						commit
						855f51be36
					
				| @ -48,7 +48,7 @@ npm_package "yarn" do | |||||||
|   version "1.6.0" |   version "1.6.0" | ||||||
| end | end | ||||||
| 
 | 
 | ||||||
| ruby_version = "2.5.3" | ruby_version = "2.6.0" | ||||||
| 
 | 
 | ||||||
| application mastodon_path do | application mastodon_path do | ||||||
|   owner "mastodon" |   owner "mastodon" | ||||||
| @ -64,8 +64,8 @@ application mastodon_path do | |||||||
|   git do |   git do | ||||||
|     user "mastodon" |     user "mastodon" | ||||||
|     group "mastodon" |     group "mastodon" | ||||||
|     repository "https://github.com/67P/mastodon.git" |     repository "https://gitea.kosmos.org/kosmos/mastodon.git" | ||||||
|     revision   "kosmos" |     revision   "production" | ||||||
|   end |   end | ||||||
| 
 | 
 | ||||||
|   mastodon_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mastodon') |   mastodon_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mastodon') | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user